Revision: 42039
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42039
Author: dfelinto
Date: 2011-11-21 20:08:16 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
silly bug in copying game properties between linked objects - reported on
BlenderArtists by Bananaft
I guess I copied/pasted the original loop code blindly.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_edit.c
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2011-11-21
19:54:47 UTC (rev 42038)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2011-11-21
20:08:16 UTC (rev 42039)
@@ -2056,10 +2056,8 @@
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 @@
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 );
+ 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);
- }
- }
- }
+ /* 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
