svn merge ^/trunk/blender -r42617:42655

1 files changed, 6 insertions, 14 deletions

diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index 966591a3e56..12ccbe1a848 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -189,7 +189,6 @@ static void meshdeformModifier_do(
 	BMEditMesh *em = me ? me->edit_btmesh : NULL;
 	DerivedMesh *tmpdm, *cagedm;
 	MDeformVert *dvert = NULL;
-	MDeformWeight *dw;
 	MDefInfluence *influences;
 	int *offsets;
 	float imat[4][4], cagemat[4][4], iobmat[4][4], icagemat[3][3], cmat[4][4];
@@ -293,21 +292,14 @@ static void meshdeformModifier_do(
 				continue;
 
 		if(dvert) {
-			for(dw=NULL, a=0; a<dvert[b].totweight; a++) {
-				if(dvert[b].dw[a].def_nr == defgrp_index) {
-					dw = &dvert[b].dw[a];
-					break;
-				}
-			}
+			fac= defvert_find_weight(&dvert[b], defgrp_index);
 
-			if(mmd->flag & MOD_MDEF_INVERT_VGROUP) {
-				if(!dw) fac= 1.0f;
-				else if(dw->weight == 1.0f) continue;
-				else fac=1.0f-dw->weight;
+			if (mmd->flag & MOD_MDEF_INVERT_VGROUP) {
+				fac= 1.0f - fac;
 			}
-			else {
-				if(!dw) continue;
-				else fac= dw->weight;
+
+			if (fac <= 0.0) {
+				continue;
 			}
 		}