diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-01-02 17:37:15 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-01-03 14:12:12 +0300 |
| commit | 65b4ebbbd5c497f732fab94bc4389533be22d4e3 (patch) | |
| tree | 4845b00129cbd33b1be9e0cbb0adad99f7ad3170 | |
| parent | 310e7eee6fc39f2415f623eb9b65a13152375279 (diff) | |
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
| -rw-r--r-- | source/blender/editors/object/object_add.c | 2 |
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 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. */ |