[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38635] trunk/blender/source/blender/ editors/object/object_edit.c: bugfix: [#28026] Copy Game Property broken

[Dalai Felinto]

Revision: 38635
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38635
Author:   dfelinto
Date:     2011-07-23 18:03:01 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
bugfix: [#28026] Copy Game Property broken

not exactly a bug, but the option to copy individual properties was not working from the SPACE menu.
I believe this was happening because we are using dynamic enums.

This commit makes the "merge" option to be the default one. So if you call it from the SPACE menu it will be the one used.

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-07-23 16:42:54 UTC (rev 38634)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2011-07-23 18:03:01 UTC (rev 38635)
@@ -2162,16 +2162,20 @@
 			} CTX_DATA_END;
 		}
 	}
-	else if (ELEM(type, COPY_PROPERTIES_REPLACE, COPY_PROPERTIES_MERGE)) {
+
+	else {
 		CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
 			if (ob != ob_iter) {
 				if (ob->data != ob_iter->data){
-					if (type == 2) {/* merge */
+					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);
 						}
-					} else /* replace */
-						copy_properties( &ob_iter->prop, &ob->prop );
+					}
 				}
 			}
 		}