diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 02:38:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 02:41:04 +0300 |
| commit | 022f3392714bc146f43f4000930939f524b82235 (patch) | |
| tree | 9d729a3786db7190d5abac6a257e1af040cfc0eb /source/blender/blenkernel/intern/object_dupli.c | |
| parent | cf966f3b38a9a53dbabf7d7ebdec419fd03e2b99 (diff) | |
DNA: rename Collection.dupli_ofs -> instance_collection
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index dbdde4cd39a..db4714a2543 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -276,7 +276,7 @@ static void make_duplis_collection(const DupliContext *ctx) /* combine collection offset and obmat */ unit_m4(collection_mat); - sub_v3_v3(collection_mat[3], collection->dupli_ofs); + sub_v3_v3(collection_mat[3], collection->instance_offset); mul_m4_m4m4(collection_mat, ob->obmat, collection_mat); /* don't access 'ob->obmat' from now on. */ @@ -943,8 +943,8 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem mul_v3_fl(tmat[3], size * scale); /* collection dupli offset, should apply after everything else */ - if (!is_zero_v3(part->instance_collection->dupli_ofs)) { - sub_v3_v3(tmat[3], part->instance_collection->dupli_ofs); + if (!is_zero_v3(part->instance_collection->instance_offset)) { + sub_v3_v3(tmat[3], part->instance_collection->instance_offset); } /* individual particle transform */ |