[Bf-blender-cvs] [712a257] master: Fix T47928: Crashing save corruption with dynamic paint drip effector groups.

Bastien Montagne noreply at git.blender.org
Fri Mar 25 13:17:33 CET 2016


Commit: 712a2579944fb9ee00fe3c6c34f07f2800361396
Author: Bastien Montagne
Date:   Fri Mar 25 13:15:50 2016 +0100
Branches: master
https://developer.blender.org/rB712a2579944fb9ee00fe3c6c34f07f2800361396

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