From 319b9d6501f2170dcf06b10de0add340d0be83a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Feb 2019 19:00:54 +1100 Subject: DNA: rename dup_* struct members to instance_* --- source/blender/blenkernel/intern/object_update.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/object_update.c') diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index f41789f6a1d..c6b66f2456f 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -226,8 +226,8 @@ void BKE_object_handle_data_update( if (psys_check_enabled(ob, psys, use_render_params)) { /* check use of dupli objects here */ if (psys->part && (psys->part->draw_as == PART_DRAW_REND || use_render_params) && - ((psys->part->ren_as == PART_DRAW_OB && psys->part->dup_ob) || - (psys->part->ren_as == PART_DRAW_GR && psys->part->dup_group))) + ((psys->part->ren_as == PART_DRAW_OB && psys->part->instance_object) || + (psys->part->ren_as == PART_DRAW_GR && psys->part->instance_collection))) { ob->transflag |= OB_DUPLIPARTS; } @@ -306,8 +306,8 @@ bool BKE_object_eval_proxy_copy(Depsgraph *depsgraph, invert_m4_m4(imat, obg->obmat); mul_m4_m4m4(object->obmat, imat, object->proxy_from->obmat); /* Should always be true. */ - if (obg->dup_group) { - add_v3_v3(object->obmat[3], obg->dup_group->dupli_ofs); + if (obg->instance_collection) { + add_v3_v3(object->obmat[3], obg->instance_collection->dupli_ofs); } } else { -- cgit v1.2.3