Merge branch 'blender-v2.81-release'

2019-11-08 14:30:22 +01:00
parent 31f8c9159d e8cd2269b4
commit 2e39f6b230
1 changed files with 5 additions and 1 deletions
--- 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;