From 65b4ebbbd5c497f732fab94bc4389533be22d4e3 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Wed, 2 Jan 2019 15:37:15 +0100 Subject: [PATCH] Fix T60056: Make Duplicates Real with Keep Hierarchy does nothing Caused by rB36ca072375deea4803df4681716c1d3224095e07 [one instance of `DEG_get_original_object` was neccesary, the other one breaks getting the parent in `BLI_ghash_lookup`] Reviewed by: brecht Differential Revision: https://developer.blender.org/D4154 --- source/blender/editors/object/object_add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index c481a62acb7..316d581870d 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1609,7 +1609,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, } for (dob = lb_duplis->first; dob; dob = dob->next) { - Object *ob_src = DEG_get_original_object(dob->ob); + Object *ob_src = dob->ob; Object *ob_dst = BLI_ghash_lookup(dupli_gh, dob); /* Remap new object to itself, and clear again newid pointer of orig object. */