[Bf-blender-cvs] [e55bd11acf3] greasepencil-object: GPencil: Remove use_cursor and replace by show_brush property
Antonio Vazquez
noreply at git.blender.org
Sat Nov 23 11:24:04 CET 2019
Commit: e55bd11acf355c0c7b3ca3924496dc507bc4f43f
Author: Antonio Vazquez
Date: Sat Nov 23 11:00:00 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe55bd11acf355c0c7b3ca3924496dc507bc4f43f
GPencil: Remove use_cursor and replace by show_brush property
As now all are brushes, we don't need a special flag for grease pencil and we can resuse standard property of brushes.
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M source/blender/blenkernel/intern/brush.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesrna/intern/rna_brush.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index d402feb281f..a3697292d62 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -273,18 +273,19 @@ class GreasePencilAppearancePanel:
ob = context.active_object
brush = None
if ob.mode == 'PAINT_GPENCIL':
- brush = tool_settings.gpencil_paint.brush
+ settings = tool_settings.gpencil_paint
elif ob.mode == 'SCULPT_GPENCIL':
- brush = tool_settings.gpencil_sculpt_paint.brush
+ settings = tool_settings.gpencil_sculpt_paint
elif ob.mode == 'WEIGHT_GPENCIL':
- brush = tool_settings.gpencil_weight_paint.brush
+ settings = tool_settings.gpencil_weight_paint
elif ob.mode == 'VERTEX_GPENCIL':
- brush = tool_settings.gpencil_vertex_paint.brush
+ settings = tool_settings.gpencil_vertex_paint
+ brush = settings.brush
if brush:
gp_settings = brush.gpencil_settings
- layout.prop(gp_settings, "use_cursor", text="Show Brush")
+ layout.prop(settings, "show_brush", text="Show Brush")
if ob.mode == 'PAINT_GPENCIL':
if brush.gpencil_tool == 'DRAW':
@@ -294,7 +295,7 @@ class GreasePencilAppearancePanel:
layout.prop(brush, "cursor_color_add", text="Color")
col = layout.column()
- col.active = gp_settings.use_cursor
+ col.active = settings.show_brush
if ob.mode == 'SCULPT_GPENCIL':
tool = brush.gpencil_sculpt_tool
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 32a89543af2..dfaeab3f324 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -158,7 +158,6 @@ void BKE_brush_init_gpencil_settings(Brush *brush)
brush->gpencil_settings->draw_jitter = 0.0f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PEN;
- brush->gpencil_settings->flag |= GP_BRUSH_ENABLE_CURSOR;
/* curves */
brush->gpencil_settings->curve_sensitivity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -296,7 +295,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Airbrush", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 300.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.4f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -330,7 +329,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Ink Pen", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 60.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 1.0f;
@@ -368,7 +367,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Ink Pen Rough", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 60.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 1.0f;
@@ -448,7 +447,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Marker Chisel", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 80.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 1.0f;
@@ -481,7 +480,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Pen", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 30.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -515,7 +514,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Pencil Soft", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 80.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.4f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -550,7 +549,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
deft_draw = brush; /* save default brush. */
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.6f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -583,7 +582,6 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Fill Area", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 20.0f;
- brush->gpencil_settings->flag |= GP_BRUSH_ENABLE_CURSOR;
brush->gpencil_settings->fill_leak = 3;
brush->gpencil_settings->fill_threshold = 0.1f;
@@ -610,7 +608,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush->size = 30.0f;
brush->gpencil_settings->draw_strength = 0.5f;
- brush->gpencil_settings->flag |= (GP_BRUSH_ENABLE_CURSOR | GP_BRUSH_DEFAULT_ERASER);
+ brush->gpencil_settings->flag |= GP_BRUSH_DEFAULT_ERASER;
brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->gpencil_settings->icon_id = GP_BRUSH_ICON_ERASE_SOFT;
@@ -624,7 +622,6 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush->size = 30.0f;
brush->gpencil_settings->draw_strength = 1.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_ENABLE_CURSOR | GP_BRUSH_DEFAULT_ERASER);
brush->gpencil_settings->eraser_mode = GP_BRUSH_ERASER_SOFT;
brush->gpencil_settings->era_strength_f = 100.0f;
brush->gpencil_settings->era_thickness_f = 50.0f;
@@ -636,7 +633,6 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Eraser Point", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 30.0f;
- brush->gpencil_settings->flag |= GP_BRUSH_ENABLE_CURSOR;
brush->gpencil_settings->eraser_mode = GP_BRUSH_ERASER_HARD;
brush->gpencil_settings->icon_id = GP_BRUSH_ICON_ERASE_HARD;
@@ -646,7 +642,6 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
brush = gpencil_brush_ensure(bmain, ts, "Eraser Stroke", OB_MODE_PAINT_GPENCIL, &new_brush);
brush->size = 30.0f;
- brush->gpencil_settings->flag |= GP_BRUSH_ENABLE_CURSOR;
brush->gpencil_settings->eraser_mode = GP_BRUSH_ERASER_STROKE;
brush->gpencil_settings->icon_id = GP_BRUSH_ICON_ERASE_STROKE;
@@ -659,7 +654,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts)
if (new_brush) {
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.8f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -692,7 +687,7 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts)
if (new_brush) {
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.8f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -709,7 +704,7 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts)
if (new_brush) {
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.8f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -721,7 +716,7 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts)
if (new_brush) {
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.8f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -733,7 +728,7 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts)
if (new_brush) {
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.8f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -745,7 +740,7 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts)
if (new_brush) {
brush->size = 25.0f;
- brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_strength = 0.8f;
brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
@@ -759,7 +754,6 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts)
void BKE_brush_gpencil_sculpt_presets(Main *bmain, ToolSettings *ts)
{
Paint *sculptpaint = &ts->gp_sculptpaint->paint;
-
Br
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list