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 <b.mont29@gmail.com>2019-11-08 16:27:48 +0300
committerBastien Montagne <b.mont29@gmail.com>2019-11-08 16:30:00 +0300
commite8cd2269b40ddd21a10fd1f745ebc131c74ca9a8 (patch)
treeeb998848886d22e3c0241de970a28a3a1530337c
parent6900187092e9b51fcc33b21aaf411695263a4578 (diff)
Fix T71199: Child-parent relationships arent kept after you make instances real.
Comparison function of the of the parent ghash was not fully correct, could lead to some false positives in some cases...
-rw-r--r--source/blender/editors/object/object_add.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index bdb23c5ce6f..b15a245c0f2 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1714,7 +1714,11 @@ static bool dupliobject_cmp(const void *a_, const void *b_)
return true;
}
- if (ELEM(a->type, b->type, OB_DUPLICOLLECTION)) {
+ if (a->type != b->type) {
+ return true;
+ }
+
+ if (a->type == OB_DUPLICOLLECTION) {
for (int i = 1; (i < MAX_DUPLI_RECUR); i++) {
if (a->persistent_id[i] != b->persistent_id[i]) {
return true;