[Bf-blender-cvs] [721f008] blender-v2.77-release: Fix T47928: Crashing save corruption with dynamic paint drip effector groups.
Bastien Montagne
noreply at git.blender.org
Tue Apr 5 10:38:16 CEST 2016
Commit: 721f0089aa6799573611c4da78f7c57a3abf7090
Author: Bastien Montagne
Date: Fri Mar 25 13:15:50 2016 +0100
Branches: blender-v2.77-release
https://developer.blender.org/rB721f0089aa6799573611c4da78f7c57a3abf7090
Fix T47928: Crashing save corruption with dynamic paint drip effector groups.
Dynapaint's `foreachIDLink` was mnot handling effector_weights->group pointer...
===================================================================
M 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 91af965..edf959f 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) {
More information about the Bf-blender-cvs
mailing list