[Bf-blender-cvs] [fff864c8780] greasepencil-object: GPencil: Back default Vertex Color for Brush to Green

Antonio Vazquez noreply at git.blender.org
Thu Feb 13 17:22:26 CET 2020


Commit: fff864c87803fb5c7f5638b3330d81688fdc01f1
Author: Antonio Vazquez
Date:   Thu Feb 13 17:22:14 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBfff864c87803fb5c7f5638b3330d81688fdc01f1

GPencil: Back default Vertex Color for Brush to Green

Other areas of blender use White, but as GPencil default background is White, to have the default color as white is not logic.

We have decided to use the default green color used as icons color and in some add 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 1a8ad2aba79..3cc11467f70 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -326,7 +326,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       /* Pin the matterial to the brush. */
       brush->gpencil_settings->flag |= GP_BRUSH_MATERIAL_PINNED;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -363,7 +362,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_INK;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -401,7 +399,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_INKNOISE;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -439,7 +436,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_MARKER;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -470,7 +466,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_CHISEL;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -502,7 +497,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PEN;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -534,7 +528,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PENCIL;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -565,7 +558,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PENCIL;
       brush->gpencil_tool = GPAINT_TOOL_DRAW;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -588,7 +580,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_tool = GPAINT_TOOL_FILL;
       brush->gpencil_settings->vertex_mode = GPPAINT_MODE_FILL;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -646,7 +637,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->draw_strength = 0.8f;
       brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -660,7 +650,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->draw_strength = 0.8f;
       brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -674,7 +663,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->draw_strength = 0.8f;
       brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -688,7 +676,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->draw_strength = 0.8f;
       brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -702,7 +689,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->draw_strength = 0.8f;
       brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }
@@ -716,7 +702,6 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
       brush->gpencil_settings->draw_strength = 0.8f;
       brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
 
-      copy_v3_fl(brush->rgb, 1.0f);
       zero_v3(brush->secondary_rgb);
       break;
     }



More information about the Bf-blender-cvs mailing list