Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-03-25 15:15:50 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-03-25 15:17:04 +0300
commit712a2579944fb9ee00fe3c6c34f07f2800361396 (patch)
tree778ad3189aaf0fe74edac1ed286d44b97c1168b4 /source/blender/modifiers/intern/MOD_dynamicpaint.c
parent4509559c1318fb60e62dd8b9e6b702b44b398e20 (diff)
Fix T47928: Crashing save corruption with dynamic paint drip effector groups.
Dynapaint's `foreachIDLink` was mnot handling effector_weights->group pointer...
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r--source/blender/modifiers/intern/MOD_dynamicpaint.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 91af9659d79..edf959f42c6 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -29,6 +29,7 @@
#include "DNA_dynamicpaint_types.h"
#include "DNA_object_types.h"
+#include "DNA_object_force.h"
#include "DNA_scene_types.h"
#include "BLI_utildefines.h"
@@ -173,6 +174,9 @@ static void foreachIDLink(ModifierData *md, Object *ob,
for (; surface; surface = surface->next) {
walk(userData, ob, (ID **)&surface->brush_group, IDWALK_NOP);
walk(userData, ob, (ID **)&surface->init_texture, IDWALK_USER);
+ if (surface->effector_weights) {
+ walk(userData, ob, (ID **)&surface->effector_weights->group, IDWALK_NOP);
+ }
}
}
if (pmd->brush) {