[Bf-blender-cvs] [2fb56e71575] master: Fix T51520: Broken vertex weights after two mesh joining.

[Bastien Montagne]

Commit: 2fb56e71575528be7c1a2b4b4fdf712d971e6eb5
Author: Bastien Montagne
Date:   Mon May 29 12:06:40 2017 +0200
Branches: master
https://developer.blender.org/rB2fb56e71575528be7c1a2b4b4fdf712d971e6eb5

Fix T51520: Broken vertex weights after two mesh joining.

Take Two, did not detect that dynapaint was also creating named vgroup cdlayer!

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

M	source/blender/blenkernel/intern/dynamicpaint.c

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

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index c525e75b825..1db69d23607 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1897,8 +1897,8 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
 
 						/* apply weights into a vertex group, if doesnt exists add a new layer */
 						if (defgrp_index != -1 && !dvert && (surface->output_name[0] != '\0')) {
-							dvert = CustomData_add_layer_named(&result->vertData, CD_MDEFORMVERT, CD_CALLOC,
-							                                   NULL, sData->total_points, surface->output_name);
+							dvert = CustomData_add_layer(&result->vertData, CD_MDEFORMVERT, CD_CALLOC,
+							                             NULL, sData->total_points);
 						}
 						if (defgrp_index != -1 && dvert) {
 							int i;