[Bf-blender-cvs] [c832eb9c98b] greasepencil-object: GPencil: Fix default vertex color

[Antonio Vazquez]

Commit: c832eb9c98be17304eb2743753ebe13ae0d2434a
Author: Antonio Vazquez
Date:   Wed Nov 13 19:28:35 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc832eb9c98be17304eb2743753ebe13ae0d2434a

GPencil: Fix default vertex color

This error was introduced when fix the double default brushes.

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

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

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 07ff14b6f0f..e864e6a0f52 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -249,16 +249,15 @@ static Brush *gpencil_brush_ensure(
   if (brush == NULL) {
     brush = BKE_brush_add_gpencil(bmain, ts, brush_name, mode);
     *new = true;
-
-    /* Set default at brush level. */
-    brush->rgb[0] = 0.498f;
-    brush->rgb[1] = 1.0f;
-    brush->rgb[2] = 0.498f;
-
-    brush->secondary_rgb[0] = 1.0f;
-    brush->secondary_rgb[1] = 1.0f;
-    brush->secondary_rgb[2] = 1.0f;
   }
+  /* Set default at brush level. */
+  brush->rgb[0] = 0.498f;
+  brush->rgb[1] = 1.0f;
+  brush->rgb[2] = 0.498f;
+
+  brush->secondary_rgb[0] = 1.0f;
+  brush->secondary_rgb[1] = 1.0f;
+  brush->secondary_rgb[2] = 1.0f;
 
   if (brush->gpencil_settings == NULL) {
     BKE_brush_init_gpencil_settings(brush);