archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T39033: Regression, duplicating proxy loses proxy

Browse Source 
fix for bug making duplicates real effected copying scenes and linked duplis.
This commit is contained in:
Campbell Barton
2014-03-12 05:54:12 +11:00
parent 09b2531bb3
commit c2045ef794
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/object.c
View File

@@ -1486,11 +1486,6 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, int copy_caches)
obn->mode = 0; obn->mode = 0;
obn->sculpt = NULL; obn->sculpt = NULL;
/* Proxies are not to be copied. */
obn->proxy_from = NULL;
obn->proxy_group = NULL;
obn->proxy = NULL;
/* increase user numbers */ /* increase user numbers */
id_us_plus((ID *)obn->data); id_us_plus((ID *)obn->data);
id_us_plus((ID *)obn->gpd); id_us_plus((ID *)obn->gpd);

5
source/blender/editors/object/object_add.c
View File

@@ -1298,6 +1298,11 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
BKE_free_animdata(&ob->id); BKE_free_animdata(&ob->id);
ob->adt = NULL; ob->adt = NULL;
/* Proxies are not to be copied. */
ob->proxy_from = NULL;
ob->proxy_group = NULL;
ob->proxy = NULL;
ob->parent = NULL; ob->parent = NULL;
BLI_listbase_clear(&ob->constraints); BLI_listbase_clear(&ob->constraints);
ob->curve_cache = NULL; ob->curve_cache = NULL;