[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34611] trunk/blender/source/blender/ blenkernel/intern/object.c: fix issue #2 raised by report: [#25894] Problems with properties across files

[Campbell Barton]

Revision: 34611
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34611
Author:   campbellbarton
Date:     2011-02-01 21:24:59 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
fix issue #2 raised by report: [#25894] Problems with properties across files

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2011-02-01 20:38:24 UTC (rev 34610)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2011-02-01 21:24:59 UTC (rev 34611)
@@ -59,11 +59,9 @@
 #include "BLI_pbvh.h"
 #include "BLI_utildefines.h"
 
-
-
 #include "BKE_main.h"
 #include "BKE_global.h"
-
+#include "BKE_idprop.h"
 #include "BKE_armature.h"
 #include "BKE_action.h"
 #include "BKE_bullet.h"
@@ -1605,7 +1603,17 @@
 		
 		armature_set_id_extern(ob);
 	}
-	
+
+	/* copy IDProperties */
+	if(ob->id.properties) {
+		IDP_FreeProperty(ob->id.properties);
+		MEM_freeN(ob->id.properties);
+		ob->id.properties= NULL;
+	}
+	if(target->id.properties) {
+		ob->id.properties= IDP_CopyProperty(target->id.properties);
+	}
+
 	/* copy drawtype info */
 	ob->dt= target->dt;
 }