[Bf-blender-cvs] [49f15e9a420] greasepencil-object: GPencil: Change default palette name

Antonio Vazquez noreply at git.blender.org
Fri Nov 15 14:27:48 CET 2019


Commit: 49f15e9a420265d8e562a02548d4ed6ec1d49614
Author: Antonio Vazquez
Date:   Fri Nov 15 14:27:06 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB49f15e9a420265d8e562a02548d4ed6ec1d49614

GPencil: Change default palette name

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 1c9ae42f308..223cfeb8d08 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3414,9 +3414,9 @@ void BKE_gpencil_palette_ensure(Main *bmain, Scene *scene)
   GpPaint *gp_paint = ts->gp_paint;
   Paint *paint = &gp_paint->paint;
 
-  paint->palette = BLI_findstring(&bmain->palettes, "Grease Pencil", offsetof(ID, name) + 2);
+  paint->palette = BLI_findstring(&bmain->palettes, "Palette", offsetof(ID, name) + 2);
   if (paint->palette == NULL) {
-    paint->palette = BKE_palette_add(bmain, "Grease Pencil");
+    paint->palette = BKE_palette_add(bmain, "Palette");
     ts->gp_vertexpaint->paint.palette = paint->palette;
 
     /* Create Colors. */



More information about the Bf-blender-cvs mailing list