svn merge ^/trunk/blender -r42009:42053
[blender.git] / source / blender / editors / object / object_edit.c
index 47f3906..6392672 100644 (file)
@@ -2057,10 +2057,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;
                }
        }
@@ -2068,17 +2066,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;