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/object.c | |
| parent | 19a703b0db1687aac2e887f32b225e897a3fac88 (diff) | |
DNA: rename dup_* struct members to instance_*
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index a2bf36bc660..5f4a64e502e 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -852,7 +852,7 @@ void BKE_object_init(Object *ob) ob->upflag = OB_POSZ; } - ob->dupfacesca = 1.0; + ob->instance_faces_scale = 1.0; ob->col_group = 0x01; ob->col_mask = 0xffff; @@ -1576,9 +1576,9 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) if (cob) { ob->rotmode = target->rotmode; mul_m4_m4m4(ob->obmat, cob->obmat, target->obmat); - if (cob->dup_group) { /* should always be true */ + if (cob->instance_collection) { /* should always be true */ float tvec[3]; - mul_v3_mat3_m4v3(tvec, ob->obmat, cob->dup_group->dupli_ofs); + mul_v3_mat3_m4v3(tvec, ob->obmat, cob->instance_collection->dupli_ofs); sub_v3_v3(ob->obmat[3], tvec); } BKE_object_apply_mat4(ob, ob->obmat, false, true); |