[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32251] trunk/blender/source/blender/ editors/object/object_edit.c: Fix #24103: copy logic bricks to objects with the same data didn't work.

[Brecht Van Lommel]

Revision: 32251
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32251
Author:   blendix
Date:     2010-10-02 16:08:09 +0200 (Sat, 02 Oct 2010)

Log Message:
-----------
Fix #24103: copy logic bricks to objects with the same data didn't work.
Don't know why this check was here, it wasn't there in 2.49 and it's not
necessary.

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	2010-10-02 13:57:38 UTC (rev 32250)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2010-10-02 14:08:09 UTC (rev 32251)
@@ -2196,29 +2196,28 @@
 
 	CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
 		if(ob != ob_iter) {
-			if (ob->data != ob_iter->data){
-				/* first: free all logic */
-				free_sensors(&ob_iter->sensors);				
-				unlink_controllers(&ob_iter->controllers);
-				free_controllers(&ob_iter->controllers);
-				unlink_actuators(&ob_iter->actuators);
-				free_actuators(&ob_iter->actuators);
-			
-				/* now copy it, this also works without logicbricks! */
-				clear_sca_new_poins_ob(ob);
-				copy_sensors(&ob_iter->sensors, &ob->sensors);
-				copy_controllers(&ob_iter->controllers, &ob->controllers);
-				copy_actuators(&ob_iter->actuators, &ob->actuators);
-				set_sca_new_poins_ob(ob_iter);
-			
-				/* some menu settings */
-				ob_iter->scavisflag= ob->scavisflag;
-				ob_iter->scaflag= ob->scaflag;
-			
-				/* set the initial state */
-				ob_iter->state= ob->state;
-				ob_iter->init_state= ob->init_state;
-			}			
+			/* first: free all logic */
+			free_sensors(&ob_iter->sensors);				
+			unlink_controllers(&ob_iter->controllers);
+			free_controllers(&ob_iter->controllers);
+			unlink_actuators(&ob_iter->actuators);
+			free_actuators(&ob_iter->actuators);
+		
+			/* now copy it, this also works without logicbricks! */
+			clear_sca_new_poins_ob(ob);
+			copy_sensors(&ob_iter->sensors, &ob->sensors);
+			copy_controllers(&ob_iter->controllers, &ob->controllers);
+			copy_actuators(&ob_iter->actuators, &ob->actuators);
+			set_sca_new_poins_ob(ob_iter);
+		
+			/* some menu settings */
+			ob_iter->scavisflag= ob->scavisflag;
+			ob_iter->scaflag= ob->scaflag;
+		
+			/* set the initial state */
+			ob_iter->state= ob->state;
+			ob_iter->init_state= ob->init_state;
+
 			if(ob_iter->totcol==ob->totcol) {
 				ob_iter->actcol= ob->actcol;
 				WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob_iter);