[Bf-blender-cvs] [b7e96c50015] greasepencil-object: Fix duplicate layer name when join

[Antonio Vazquez]

Commit: b7e96c50015053f43d8e0ec08b7a26181184b507
Author: Antonio Vazquez
Date:   Thu Dec 21 13:33:05 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb7e96c50015053f43d8e0ec08b7a26181184b507

Fix duplicate layer name when join

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

M	source/blender/editors/gpencil/gpencil_data.c

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

diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 7287f485d66..6bdc51c2d8e 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1977,6 +1977,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op)
 					}
 
 					/* add to datablock */
+					BLI_uniquename(&gpd_act->layers, gpl_new, DATA_("GP_Layer"), '.', offsetof(bGPDlayer, info), sizeof(gpl_new->info));
 					BLI_addtail(&gpd_act->layers, gpl_new);
 				}