diff options
author | Bastien Montagne <b.mont29@gmail.com> | 2019-11-08 16:30:22 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2019-11-08 16:30:22 +0300 |
commit | 2e39f6b230f9b1e087b14c3405d02745c26ea3b6 (patch) | |
tree | dbb712acb0d470e6947fbe9f5d341ccc38229636 /source | |
parent | 31f8c9159d169652b3a5d0db91c2f0d80dbee658 (diff) | |
parent | e8cd2269b40ddd21a10fd1f745ebc131c74ca9a8 (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/object/object_add.c | 6 |
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; |