diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-08 15:21:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-08 16:05:37 +0300 |
commit | f375028a2542981732aef6ce4700aa951325e63d (patch) | |
tree | 4219cd4253425e9ccfa7cfa4c78f30aa4527b6c9 /source/blender/modifiers/intern/MOD_wave.c | |
parent | fb5328d59f465320b6b57876b1d75a1a09c144ab (diff) |
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.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wave.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_wave.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 5b98f221489..f13eeb3185e 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -45,6 +45,7 @@ #include "BKE_deform.h" #include "BKE_DerivedMesh.h" #include "BKE_library.h" +#include "BKE_library_query.h" #include "BKE_scene.h" #include "BKE_texture.h" @@ -110,8 +111,8 @@ static void foreachObjectLink( { WaveModifierData *wmd = (WaveModifierData *) md; - walk(userData, ob, &wmd->objectcenter); - walk(userData, ob, &wmd->map_object); + walk(userData, ob, &wmd->objectcenter, IDWALK_NOP); + walk(userData, ob, &wmd->map_object, IDWALK_NOP); } static void foreachIDLink(ModifierData *md, Object *ob, @@ -119,7 +120,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, { WaveModifierData *wmd = (WaveModifierData *) md; - walk(userData, ob, (ID **)&wmd->texture); + walk(userData, ob, (ID **)&wmd->texture, IDWALK_USER); foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); } |