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_warp.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_warp.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index b364b7a9e38..27d3bac59ec 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -36,6 +36,7 @@ #include "BLI_utildefines.h" #include "BKE_cdderivedmesh.h" +#include "BKE_library_query.h" #include "BKE_modifier.h" #include "BKE_deform.h" #include "BKE_texture.h" @@ -115,16 +116,16 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, { WarpModifierData *wmd = (WarpModifierData *) md; - walk(userData, ob, &wmd->object_from); - walk(userData, ob, &wmd->object_to); - walk(userData, ob, &wmd->map_object); + walk(userData, ob, &wmd->object_from, IDWALK_NOP); + walk(userData, ob, &wmd->object_to, IDWALK_NOP); + walk(userData, ob, &wmd->map_object, IDWALK_NOP); } static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData) { WarpModifierData *wmd = (WarpModifierData *) md; - walk(userData, ob, (ID **)&wmd->texture); + walk(userData, ob, (ID **)&wmd->texture, IDWALK_USER); foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); } |