svn merge ^/trunk/blender -r43564:43609

1 files changed, 11 insertions, 0 deletions

diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c
index 473692f123d..e3eec5243fb 100644
--- a/source/blender/modifiers/intern/MOD_weightvgedit.c
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.c
@@ -204,6 +204,17 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 		return dm;
 
 	dvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MDEFORMVERT, numVerts);
+	/* If no vertices were ever added to an object's vgroup, dvert might be NULL. */
+	if(!dvert)
+		/* If this modifier is not allowed to add vertices, just return. */
+		if(!do_add)
+			return dm;
+		/* Else, add a valid data layer! */
+		dvert = CustomData_add_layer_named(&dm->vertData, CD_MDEFORMVERT, CD_CALLOC,
+		                                   NULL, numVerts, wmd->defgrp_name);
+		/* Ultimate security check. */
+		if(!dvert)
+			return dm;
 
 	/* Get org weights, assuming 0.0 for vertices not in given vgroup. */
 	org_w = MEM_mallocN(sizeof(float) * numVerts, "WeightVGEdit Modifier, org_w");