diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-08-25 18:26:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-08-25 18:26:58 +0300 |
| commit | 047d0e6c4a96827a35d10111f08a631c8a2c0b64 (patch) | |
| tree | cf2ce946f000095a044e6b8d67672e81e76bc81a /source/blender/modifiers/intern | |
| parent | 9b41ac625144b09868229fd3e14f5269d97cf44b (diff) | |
| parent | 500d815478966de6ad509c2e6a73c61fce8513a5 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_dynamicpaint.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluid.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 11bbe8dc83e..6c5baabe756 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -254,7 +254,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u } if (clmd->sim_parms && clmd->sim_parms->effector_weights) { - walk(userData, ob, (ID **)&clmd->sim_parms->effector_weights->group, IDWALK_CB_NOP); + walk(userData, ob, (ID **)&clmd->sim_parms->effector_weights->group, IDWALK_CB_USER); } } diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 4afb81c04a9..c23367f9b9b 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -158,7 +158,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u walk(userData, ob, (ID **)&surface->brush_group, IDWALK_CB_NOP); walk(userData, ob, (ID **)&surface->init_texture, IDWALK_CB_USER); if (surface->effector_weights) { - walk(userData, ob, (ID **)&surface->effector_weights->group, IDWALK_CB_NOP); + walk(userData, ob, (ID **)&surface->effector_weights->group, IDWALK_CB_USER); } } } diff --git a/source/blender/modifiers/intern/MOD_fluid.c b/source/blender/modifiers/intern/MOD_fluid.c index a3e9cd083d2..3ab6d08ee15 100644 --- a/source/blender/modifiers/intern/MOD_fluid.c +++ b/source/blender/modifiers/intern/MOD_fluid.c @@ -215,7 +215,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u } if (fmd->domain->effector_weights) { - walk(userData, ob, (ID **)&fmd->domain->effector_weights->group, IDWALK_CB_NOP); + walk(userData, ob, (ID **)&fmd->domain->effector_weights->group, IDWALK_CB_USER); } } |