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 | |
| parent | cf966f3b38a9a53dbabf7d7ebdec419fd03e2b99 (diff) | |
DNA: rename Collection.dupli_ofs -> instance_collection
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 06b6fb38a2a..65883d48bf7 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1579,7 +1579,7 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) mul_m4_m4m4(ob->obmat, cob->obmat, target->obmat); if (cob->instance_collection) { /* should always be true */ float tvec[3]; - mul_v3_mat3_m4v3(tvec, ob->obmat, cob->instance_collection->dupli_ofs); + mul_v3_mat3_m4v3(tvec, ob->obmat, cob->instance_collection->instance_offset); sub_v3_v3(ob->obmat[3], tvec); } BKE_object_apply_mat4(ob, ob->obmat, false, true); 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 */ diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index cb8bb47a577..0ecb088e57e 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -308,7 +308,7 @@ bool BKE_object_eval_proxy_copy(Depsgraph *depsgraph, mul_m4_m4m4(object->obmat, imat, object->proxy_from->obmat); /* Should always be true. */ if (obg->instance_collection) { - add_v3_v3(object->obmat[3], obg->instance_collection->dupli_ofs); + add_v3_v3(object->obmat[3], obg->instance_collection->instance_offset); } } else { |