From f375028a2542981732aef6ce4700aa951325e63d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 8 Oct 2015 14:21:11 +0200 Subject: Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed since some IDs (objects) are not 'refcounted' while others (textures) are... Partial merge from id-remap branch. --- source/blender/modifiers/intern/MOD_smoke.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_smoke.c') diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 657c4e09d96..f0f235c8ad5 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -48,6 +48,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_library.h" +#include "BKE_library_query.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_smoke.h" @@ -339,17 +340,17 @@ static void foreachIDLink(ModifierData *md, Object *ob, SmokeModifierData *smd = (SmokeModifierData *) md; if (smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain) { - walk(userData, ob, (ID **)&smd->domain->coll_group); - walk(userData, ob, (ID **)&smd->domain->fluid_group); - walk(userData, ob, (ID **)&smd->domain->eff_group); + walk(userData, ob, (ID **)&smd->domain->coll_group, IDWALK_NOP); + walk(userData, ob, (ID **)&smd->domain->fluid_group, IDWALK_NOP); + walk(userData, ob, (ID **)&smd->domain->eff_group, IDWALK_NOP); if (smd->domain->effector_weights) { - walk(userData, ob, (ID **)&smd->domain->effector_weights->group); + walk(userData, ob, (ID **)&smd->domain->effector_weights->group, IDWALK_NOP); } } if (smd->type == MOD_SMOKE_TYPE_FLOW && smd->flow) { - walk(userData, ob, (ID **)&smd->flow->noise_texture); + walk(userData, ob, (ID **)&smd->flow->noise_texture, IDWALK_USER); } } -- cgit v1.2.3