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/blenloader/intern/writefile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenloader/intern/writefile.c') diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 85ff2973074..bcbfb804479 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1400,12 +1400,12 @@ static void write_particlesettings(WriteData *wd, ParticleSettings *part) write_curvemapping(wd, part->twistcurve); } - for (ParticleDupliWeight *dw = part->dupliweights.first; dw; dw = dw->next) { + for (ParticleDupliWeight *dw = part->instance_weights.first; dw; dw = dw->next) { /* update indices, but only if dw->ob is set (can be NULL after loading e.g.) */ if (dw->ob != NULL) { dw->index = 0; - if (part->dup_group) { /* can be NULL if lining fails or set to None */ - FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(part->dup_group, object) + if (part->instance_collection) { /* can be NULL if lining fails or set to None */ + FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(part->instance_collection, object) { if (object != dw->ob) { dw->index++; -- cgit v1.2.3