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/collision.c | |
| parent | 19a703b0db1687aac2e887f32b225e897a3fac88 (diff) | |
DNA: rename dup_* struct members to instance_*
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 8fd8285c433..f914441aa59 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -921,8 +921,8 @@ static void add_collision_object(ListBase *relations, Object *ob, int level, uns /* objects in dupli groups, one level only for now */ /* TODO: this doesn't really work, we are not taking into account the * dupli transforms and can get objects in the list multiple times. */ - if (ob->dup_group && level == 0) { - Collection *collection= ob->dup_group; + if (ob->instance_collection && level == 0) { + Collection *collection= ob->instance_collection; /* add objects */ FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, object) |