From c2045ef794a054edbe6be18db51eadf4b268111d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 12 Mar 2014 05:54:12 +1100
Subject: [PATCH] Fix T39033: Regression, duplicating proxy loses proxy

fix for bug making duplicates real effected copying scenes and linked duplis.
---
 source/blender/blenkernel/intern/object.c  | 5 -----
 source/blender/editors/object/object_add.c | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 06034f24f91..43dbc34f3d3 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 a2101716dbf..572327e2b57 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;
-- 
GitLab