diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 11:00:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 11:00:54 +0300 |
commit | 319b9d6501f2170dcf06b10de0add340d0be83a3 (patch) | |
tree | d43beea169beef1fae3c2f253e4aab7fc116bad8 /source/blender/blenkernel/intern/collection.c | |
parent | 19a703b0db1687aac2e887f32b225e897a3fac88 (diff) |
DNA: rename dup_* struct members to instance_*
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 2cbce902b94..41393d99db4 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -401,8 +401,8 @@ Collection *BKE_collection_master(const Scene *scene) static bool collection_object_cyclic_check_internal(Object *object, Collection *collection) { - if (object->dup_group) { - Collection *dup_collection = object->dup_group; + if (object->instance_collection) { + Collection *dup_collection = object->instance_collection; if ((dup_collection->id.tag & LIB_TAG_DOIT) == 0) { /* Cycle already exists in collections, let's prevent further crappyness */ return true; @@ -483,9 +483,9 @@ bool BKE_collection_is_empty(Collection *collection) static bool collection_object_add(Main *bmain, Collection *collection, Object *ob, int flag, const bool add_us) { - if (ob->dup_group) { + if (ob->instance_collection) { /* Cyclic dependency check. */ - if (collection_find_child_recursive(ob->dup_group, collection)) { + if (collection_find_child_recursive(ob->instance_collection, collection)) { return false; } } |