Bugfix: crash in assigning automatic vertex weights from armature.

1 files changed, 5 insertions, 2 deletions

diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 2b17a6cbe54..902a32bb7f3 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -405,20 +405,23 @@ static float get_vert_def_nr(Object *ob, int def_nr, int vertnum)
 			eve= BLI_findlink(&me->edit_mesh->verts, vertnum);
 			if(!eve) return 0.0f;
 			dvert= CustomData_em_get(&me->edit_mesh->vdata, eve->data, CD_MDEFORMVERT);
+			vertnum= 0;
 		}
 		else
-			dvert = me->dvert + vertnum;
+			dvert = me->dvert;
 	}
 	else if(ob->type==OB_LATTICE) {
 		Lattice *lt= vgroup_edit_lattice(ob);
 		
 		if(lt->dvert)
-			dvert = lt->dvert + vertnum;
+			dvert = lt->dvert;
 	}
 	
 	if(dvert==NULL)
 		return 0.0f;
 	
+	dvert += vertnum;
+	
 	for(i=dvert->totweight-1 ; i>=0 ; i--)
 		if(dvert->dw[i].def_nr == def_nr)
 			return dvert->dw[i].weight;