diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2011-11-22 00:08:16 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2011-11-22 00:08:16 +0400 |
commit | 450e25c23190ac02f1103ae4b594c8214a05c106 (patch) | |
tree | 9de13486178eda9e0dcace91ad1c1a700301a15b /source/blender/editors/object/object_edit.c | |
parent | a41c693ad448c909a92e34891b279266ab686f90 (diff) |
silly bug in copying game properties between linked objects - reported on BlenderArtists by Bananaft
I guess I copied/pasted the original loop code blindly.
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
-rw-r--r-- | source/blender/editors/object/object_edit.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index c39477cbf6c..722e7057ece 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -2056,10 +2056,8 @@ static int game_property_copy_exec(bContext *C, wmOperator *op) if(prop) { CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) { - if (ob != ob_iter) { - if (ob->data != ob_iter->data) - set_ob_property(ob_iter, prop); - } + if (ob != ob_iter) + set_ob_property(ob_iter, prop); } CTX_DATA_END; } } @@ -2067,17 +2065,13 @@ static int game_property_copy_exec(bContext *C, wmOperator *op) else { CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) { if (ob != ob_iter) { - if (ob->data != ob_iter->data){ - if (type == COPY_PROPERTIES_REPLACE) - copy_properties( &ob_iter->prop, &ob->prop ); - - /* merge - the default when calling with no argument */ - else { - for(prop = ob->prop.first; prop; prop= prop->next ) { - set_ob_property(ob_iter, prop); - } - } - } + if (type == COPY_PROPERTIES_REPLACE) + copy_properties(&ob_iter->prop, &ob->prop); + + /* merge - the default when calling with no argument */ + else + for(prop = ob->prop.first; prop; prop= prop->next) + set_ob_property(ob_iter, prop); } } CTX_DATA_END; |