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.c | |
| parent | cf966f3b38a9a53dbabf7d7ebdec419fd03e2b99 (diff) | |
DNA: rename Collection.dupli_ofs -> instance_collection
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 1 insertions, 1 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); |