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/library_query.c | |
parent | 19a703b0db1687aac2e887f32b225e897a3fac88 (diff) |
DNA: rename dup_* struct members to instance_*
Diffstat (limited to 'source/blender/blenkernel/intern/library_query.c')
-rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 29e0ee0715d..92633803895 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -560,7 +560,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call data.cb_flag = data_cb_flag; CALLBACK_INVOKE(object->gpd, IDWALK_CB_USER); - CALLBACK_INVOKE(object->dup_group, IDWALK_CB_USER); + CALLBACK_INVOKE(object->instance_collection, IDWALK_CB_USER); if (object->pd) { CALLBACK_INVOKE(object->pd->tex, IDWALK_CB_USER); @@ -812,8 +812,8 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call case ID_PA: { ParticleSettings *psett = (ParticleSettings *) id; - CALLBACK_INVOKE(psett->dup_group, IDWALK_CB_USER); - CALLBACK_INVOKE(psett->dup_ob, IDWALK_CB_NOP); + CALLBACK_INVOKE(psett->instance_collection, IDWALK_CB_USER); + CALLBACK_INVOKE(psett->instance_object, IDWALK_CB_NOP); CALLBACK_INVOKE(psett->bb_ob, IDWALK_CB_NOP); CALLBACK_INVOKE(psett->collision_group, IDWALK_CB_NOP); @@ -854,7 +854,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call } } - for (ParticleDupliWeight *dw = psett->dupliweights.first; dw; dw = dw->next) { + for (ParticleDupliWeight *dw = psett->instance_weights.first; dw; dw = dw->next) { CALLBACK_INVOKE(dw->ob, IDWALK_CB_NOP); } break; |