[Bf-blender-cvs] [bbe33ec] master: Depsgraph: Fix crash in Weight VG modifier

[Sergey Sharybin]

Commit: bbe33ecc881413edd2952720ad6377d00c51ed93
Author: Sergey Sharybin
Date:   Mon Jul 11 15:15:09 2016 +0200
Branches: master
https://developer.blender.org/rBbbe33ecc881413edd2952720ad6377d00c51ed93

Depsgraph: Fix crash in Weight VG modifier

===================================================================

M       source/blender/modifiers/intern/MOD_weightvgmix.c
M       source/blender/modifiers/intern/MOD_weightvgproximity.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c 
b/source/blender/modifiers/intern/MOD_weightvgmix.c
index 01a219d..170fbbe 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -221,9 +221,11 @@ static void updateDepsgraph(ModifierData *md,
        WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
        if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == 
MOD_DISP_MAP_OBJECT) {
                DEG_add_object_relation(node, wmd->mask_tex_map_obj, 
DEG_OB_COMP_TRANSFORM, "WeightVGMix Modifier");
+               DEG_add_object_relation(node, wmd->mask_tex_map_obj, 
DEG_OB_COMP_GEOMETRY, "WeightVGMix Modifier");
        }
        if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) {
                DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, 
"WeightVGMix Modifier");
+               DEG_add_object_relation(node, ob, DEG_OB_COMP_GEOMETRY, 
"WeightVGMix Modifier");
        }
 }
 
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c 
b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 0968d2a..af59f11 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -378,12 +378,15 @@ static void updateDepsgraph(ModifierData *md,
        WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData 
*)md;
        if (wmd->proximity_ob_target != NULL) {
                DEG_add_object_relation(node, wmd->proximity_ob_target, 
DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");
+               DEG_add_object_relation(node, wmd->proximity_ob_target, 
DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
        }
        if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == 
MOD_DISP_MAP_OBJECT) {
                DEG_add_object_relation(node, wmd->mask_tex_map_obj, 
DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");
+               DEG_add_object_relation(node, wmd->mask_tex_map_obj, 
DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
        }
        if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) {
                DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, 
"WeightVGProximity Modifier");
+               DEG_add_object_relation(node, ob, DEG_OB_COMP_GEOMETRY, 
"WeightVGProximity Modifier");
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs