[Bf-blender-cvs] [44d4fdec7ef] master: Fix T64266: Incorrect modifier object target after making duplicates real for instanced collections.

Bastien Montagne noreply at git.blender.org
Wed May 8 15:54:48 CEST 2019


Commit: 44d4fdec7efd2ff6549cf79b7a66a912e00a5d3f
Author: Bastien Montagne
Date:   Wed May 8 15:50:50 2019 +0200
Branches: master
https://developer.blender.org/rB44d4fdec7efd2ff6549cf79b7a66a912e00a5d3f

Fix T64266: Incorrect modifier object target after making duplicates real for instanced collections.

Not sure why newid was set in evaluated object instead of orig one,
makes no sense to me, since we want to operate remapping of ID pointers
on orig data? Looks like that was something overseen when that code was
ported to new COW system.

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

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

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

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index f8a13579732..0185b664fba 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1656,7 +1656,7 @@ static void make_object_duplilist_real(
 
   for (dob = lb_duplis->first; dob; dob = dob->next) {
     Object *ob_src = DEG_get_original_object(dob->ob);
-    Object *ob_dst = ID_NEW_SET(dob->ob, BKE_object_copy(bmain, ob_src));
+    Object *ob_dst = ID_NEW_SET(ob_src, BKE_object_copy(bmain, ob_src));
     Base *base_dst;
 
     /* font duplis can have a totcol without material, we get them from parent



More information about the Bf-blender-cvs mailing list