[Bf-blender-cvs] [e826312d845] greasepencil-object: GPencil: Set Vertex Factor to 1 and invert default colors

Antonio Vazquez noreply at git.blender.org
Sun Nov 3 15:58:53 CET 2019


Commit: e826312d845d1d401692d233815d84d8f016b9d1
Author: Antonio Vazquez
Date:   Sun Nov 3 15:58:46 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe826312d845d1d401692d233815d84d8f016b9d1

GPencil: Set Vertex Factor to 1 and invert default colors

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

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

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 08cdf75b892..bd0aa829347 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -252,6 +252,17 @@ static Brush *gpencil_brush_ensure(Main *bmain, ToolSettings *ts, char *brush_na
     BKE_brush_init_gpencil_settings(brush);
   }
 
+  /* Set default at brush level. */
+  zero_v3(brush->rgb);
+  brush->secondary_rgb[0] = 1.0f;
+  brush->secondary_rgb[1] = 1.0f;
+  brush->secondary_rgb[2] = 1.0f;
+
+  /* Set vertex mix factor. */
+  if (brush->gpencil_settings) {
+    brush->gpencil_settings->vertex_factor = 1.0f;
+  }
+
   return brush;
 }



More information about the Bf-blender-cvs mailing list