[Bf-blender-cvs] [dfc088fb57a] greasepencil-object: GPencil: Exchange default colors for Tint and Draw

Antonio Vazquez noreply at git.blender.org
Mon Nov 4 19:29:58 CET 2019


Commit: dfc088fb57a263ebbf8f150e2dc21bfbf26e615e
Author: Antonio Vazquez
Date:   Mon Nov 4 19:29:52 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBdfc088fb57a263ebbf8f150e2dc21bfbf26e615e

GPencil: Exchange default colors for Tint and Draw

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

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

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index facdae43db6..50c9fda88a9 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -253,9 +253,9 @@ static Brush *gpencil_brush_ensure(Main *bmain, ToolSettings *ts, char *brush_na
   }
 
   /* Set default at brush level. */
-  brush->rgb[0] = 0.757f;
-  brush->rgb[1] = 0.659f;
-  brush->rgb[2] = 0.824f;
+  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;
@@ -648,9 +648,10 @@ void BKE_brush_gpencil_presets(Main *bmain, ToolSettings *ts)
 
   brush->gpencil_settings->draw_strength = 0.8f;
   brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
-  brush->rgb[0] = 0.498f;
-  brush->rgb[1] = 1.0f;
-  brush->rgb[2] = 0.498f;
+  brush->rgb[0] = 0.757f;
+  brush->rgb[1] = 0.659f;
+  brush->rgb[2] = 0.824f;
+
   zero_v3(brush->secondary_rgb);
 
   brush->gpencil_settings->icon_id = GP_BRUSH_ICON_TINT;



More information about the Bf-blender-cvs mailing list