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:
authorBastien Montagne <montagne29@wanadoo.fr>2019-05-08 16:50:50 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-05-08 16:54:39 +0300
commit44d4fdec7efd2ff6549cf79b7a66a912e00a5d3f (patch)
tree872b4ccc83256d429385900f84c6223543930d5d
parent3b9813fe50497e077faeb052a26a436868230e20 (diff)
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.
-rw-r--r--source/blender/editors/object/object_add.c2
1 files changed, 1 insertions, 1 deletions
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