[Bf-blender-cvs] [bb48f177d9f] greasepencil-object: GPencil: Fix default palette for Vertex Paint mode

[Antonio Vazquez]

Commit: bb48f177d9f15f16e521a1258acfd621c72c8d06
Author: Antonio Vazquez
Date:   Thu Nov 7 17:59:11 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbb48f177d9f15f16e521a1258acfd621c72c8d06

GPencil: Fix default palette for Vertex Paint mode

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 63ec9b4db92..7f5c9d3aabc 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3149,6 +3149,8 @@ void BKE_gpencil_palette_ensure(Main *bmain, Scene *scene)
   paint->palette = BLI_findstring(&bmain->palettes, "Grease Pencil", offsetof(ID, name) + 2);
   if (paint->palette == NULL) {
     paint->palette = BKE_palette_add(bmain, "Grease Pencil");
+    ts->gp_vertexpaint->paint.palette = paint->palette;
+
     /* Create Colors. */
     for (int i = 0; i < totcol; i++) {
       PaletteColor *palcol = BKE_palette_color_add(paint->palette);
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 6cdc422e096..2f063e05cdf 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -553,6 +553,9 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
     Scene *scene = bmain->scenes.first;
     BKE_brush_gpencil_presets(bmain, scene->toolsettings);
 
+    /* Ensure new Vertex Paint mode. */
+    BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_GPENCIL_VERTEX);
+
     /* Ensure Palette by default. */
     BKE_gpencil_palette_ensure(bmain, scene);
   }