Blender Git Loki

Git Commits -> Revision 6991937

Revision 6991937 by Bastien Montagne (master)
July 5, 2019, 16:36 (GMT)
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing.

Preserving/rebuilding relashionships in recursive instancing was simply
not supported at all, code handling that was assuming a single level of
instancing.

This commit makes the following changes:
* Mixing DupliCollection and DupliVerts/Faces in the recursive chain is
now supported (by using a same GHash in all cases, differences of
persistent_id handling in hashing and comparison is now down inside the
relevant functions).
* When both "keep hierarchy" and "parent" options are enabled, code will
attempt to parent new objects to their version of instancer (instead of
parenting them systematically to the root object). This will preserve
the hierarchy much better.
* Collection is removed from dupli empties that have been made 'real'
(the duplication flag itself was already cleared, but the link to the
instantiated collection was kept).

Commit Details:

Full Hash: 699193713fc003a51d8b0c717856e3543f3a4ee5
Parent Commit: 784121d
Lines Changed: +101, -43

1 Modified Path:

/source/blender/editors/object/object_add.c (+101, -43) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021