[Bf-blender-cvs] [c2045ef] master: Fix T39033: Regression, duplicating proxy loses proxy

Campbell Barton noreply at git.blender.org
Tue Mar 11 19:56:39 CET 2014


Commit: c2045ef794a054edbe6be18db51eadf4b268111d
Author: Campbell Barton
Date:   Wed Mar 12 05:54:12 2014 +1100
https://developer.blender.org/rBc2045ef794a054edbe6be18db51eadf4b268111d

Fix T39033: Regression, duplicating proxy loses proxy

fix for bug making duplicates real effected copying scenes and linked duplis.

===================================================================

M	source/blender/blenkernel/intern/object.c
M	source/blender/editors/object/object_add.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 06034f2..43dbc34 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1486,11 +1486,6 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, int copy_caches)
 	obn->mode = 0;
 	obn->sculpt = NULL;
 
-	/* Proxies are not to be copied. */
-	obn->proxy_from = NULL;
-	obn->proxy_group = NULL;
-	obn->proxy = NULL;
-
 	/* increase user numbers */
 	id_us_plus((ID *)obn->data);
 	id_us_plus((ID *)obn->gpd);
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a210171..572327e 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1298,6 +1298,11 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 		BKE_free_animdata(&ob->id);
 		ob->adt = NULL;
 
+		/* Proxies are not to be copied. */
+		ob->proxy_from = NULL;
+		ob->proxy_group = NULL;
+		ob->proxy = NULL;
+
 		ob->parent = NULL;
 		BLI_listbase_clear(&ob->constraints);
 		ob->curve_cache = NULL;




More information about the Bf-blender-cvs mailing list