- vertex group modifiers isDisabled functions were incorrect, need to check if the string is set: == NULL will never be true.

- was doing NULL checks on freeing memory in cases where the values were already accessed (blender would have crashed anyway), so remove the NULL checks.
- use deform.c api weight functions to replace inline weight lookups in some cases.
- change if checks in weightvg_do_mask() so its more obvious whats going on.

1 files changed, 5 insertions, 9 deletions

diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 36f749ab506..513ba9c815f 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -327,7 +327,7 @@ static int isDisabled(ModifierData *md, int UNUSED(useRenderParams))
 {
 	WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData*) md;
 	/* If no vertex group, bypass. */
-	if (wmd->defgrp_name == NULL) return 1;
+	if (wmd->defgrp_name[0] == '\0') return 1;
 	/* If no target object, bypass. */
 	return (wmd->proximity_ob_target == NULL);
 }
@@ -505,14 +505,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 	weightvg_update_vg(dvert, defgrp_idx, numIdx, indices, org_w, 0, 0.0f, 0, 0.0f);
 
 	/* Freeing stuff. */
-	if (org_w)
-		MEM_freeN(org_w);
-	if (new_w)
-		MEM_freeN(new_w);
-	if (indices)
-		MEM_freeN(indices);
-	if (v_cos)
-		MEM_freeN(v_cos);
+	MEM_freeN(org_w);
+	MEM_freeN(new_w);
+	MEM_freeN(indices);
+	MEM_freeN(v_cos);
 
 	/* Return the vgroup-modified mesh. */
 	return ret;