[Bf-blender-cvs] [57dbe05386f] temp-lanpr-cleanup2: Fix T71199: Child-parent relationships arent kept after you make instances real.

[Bastien Montagne]

Commit: 57dbe05386f6b038777a3c34a78fead6970333a9
Author: Bastien Montagne
Date:   Fri Nov 8 14:27:48 2019 +0100
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rB57dbe05386f6b038777a3c34a78fead6970333a9

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...

===================================================================

M	source/blender/editors/object/object_add.c

===================================================================

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;