[Bf-blender-cvs] [6fe83d88b9a] greasepencil-object: Enable Settings by default in predefined brushes

[Antonio Vazquez]

Commit: 6fe83d88b9ae3356bb90ec03e86eed5b571b645a
Author: Antonio Vazquez
Date:   Fri Mar 9 10:31:56 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6fe83d88b9ae3356bb90ec03e86eed5b571b645a

Enable Settings by default in predefined brushes

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil.c 
b/source/blender/blenkernel/intern/gpencil.c
index 664176209e2..8f2727d63b8 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -582,6 +582,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
        brush->draw_angle = 0.0f;
        brush->draw_angle_factor = 0.0f;
 
+       brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
        brush->draw_smoothfac = 0.5f;
        brush->draw_smoothlvl = 1;
        brush->thick_smoothfac = 1.0f;
@@ -613,6 +614,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
        brush->draw_angle = 0.0f;
        brush->draw_angle_factor = 0.0f;
 
+       brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
        brush->draw_smoothfac = 0.5f;
        brush->draw_smoothlvl = 1;
        brush->sublevel = 1;
@@ -642,6 +644,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
        brush->draw_angle = 0.0f;
        brush->draw_angle_factor = 0.0f;
 
+       brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
        brush->draw_smoothfac = 0.5f;
        brush->draw_smoothlvl = 1;
        brush->thick_smoothfac = 1.0f;
@@ -677,6 +680,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
        brush->draw_angle = 0.0f;
        brush->draw_angle_factor = 0.0f;
 
+       brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
        brush->draw_smoothfac = 1.0f;
        brush->draw_smoothlvl = 2;
        brush->thick_smoothfac = 0.5f;
@@ -713,6 +717,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
        brush->draw_angle = 0.0f;
        brush->draw_angle_factor = 0.0f;
 
+       brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
        brush->draw_smoothfac = 0.0f;
        brush->draw_smoothlvl = 1;
        brush->thick_smoothfac = 1.0f;
@@ -742,6 +747,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
        brush->draw_angle = M_PI_4; /* 45 degrees */
        brush->draw_angle_factor = 1.0f;
 
+       brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
        brush->draw_smoothfac = 0.5f;
        brush->draw_smoothlvl = 1;
        brush->thick_smoothfac = 1.0f;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs