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_dynamicpaint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c') diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index f1b6ceb070c..91af9659d79 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -35,6 +35,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_dynamicpaint.h" +#include "BKE_library_query.h" #include "BKE_modifier.h" #include "depsgraph_private.h" @@ -170,12 +171,12 @@ static void foreachIDLink(ModifierData *md, Object *ob, DynamicPaintSurface *surface = pmd->canvas->surfaces.first; for (; surface; surface = surface->next) { - walk(userData, ob, (ID **)&surface->brush_group); - walk(userData, ob, (ID **)&surface->init_texture); + walk(userData, ob, (ID **)&surface->brush_group, IDWALK_NOP); + walk(userData, ob, (ID **)&surface->init_texture, IDWALK_USER); } } if (pmd->brush) { - walk(userData, ob, (ID **)&pmd->brush->mat); + walk(userData, ob, (ID **)&pmd->brush->mat, IDWALK_USER); } } -- cgit v1.2.3