Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-03-11 22:54:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-11 22:56:15 +0400
commitc2045ef794a054edbe6be18db51eadf4b268111d (patch)
treed4f6d11621f0c025cd2abe4faaa5ff29c6c51aaa /source/blender/blenkernel/intern/object.c
parent09b2531bb3a4412e4f7a57a15585b611aeaf6c6e (diff)
Fix T39033: Regression, duplicating proxy loses proxy
fix for bug making duplicates real effected copying scenes and linked duplis.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c5
1 files changed, 0 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);