diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-30 18:33:34 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-30 18:33:34 +0300 |
commit | 9d725fc0cf4245baddeb3a857752b42e87455d83 (patch) | |
tree | caf11db7eb3dd2a725b432f77f2c47b7dcc94a3e /source/blender/editors/gpencil | |
parent | 515e8e4f7c21f5bd8a204869acae8327b4db62bb (diff) | |
parent | ec26260132b49bf071facc3fbd728413ef2155d1 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 4330a07057e..8771fcb0c8d 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -370,7 +370,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op) if (mode == OB_MODE_PAINT_GPENCIL) { /* Be sure we have brushes and Paint settings. - * Need Draw and Vertex (used fro Tint). */ + * Need Draw and Vertex (used for Tint). */ BKE_paint_ensure(ts, (Paint **)&ts->gp_paint); BKE_paint_ensure(ts, (Paint **)&ts->gp_vertexpaint); @@ -485,11 +485,13 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op) } if (mode == OB_MODE_SCULPT_GPENCIL) { - /* be sure we have brushes */ + /* Be sure we have brushes. */ BKE_paint_ensure(ts, (Paint **)&ts->gp_sculptpaint); - BKE_paint_toolslots_brush_validate(bmain, &ts->gp_sculptpaint->paint); - BKE_brush_gpencil_sculpt_presets(bmain, ts, false); + const bool reset_mode = (ts->gp_sculptpaint->paint.brush == NULL); + BKE_brush_gpencil_sculpt_presets(bmain, ts, reset_mode); + + BKE_paint_toolslots_brush_validate(bmain, &ts->gp_sculptpaint->paint); } /* setup other modes */ @@ -592,11 +594,13 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op) } if (mode == OB_MODE_WEIGHT_GPENCIL) { - /* be sure we have brushes */ + /* Be sure we have brushes. */ BKE_paint_ensure(ts, (Paint **)&ts->gp_weightpaint); - BKE_paint_toolslots_brush_validate(bmain, &ts->gp_weightpaint->paint); - BKE_brush_gpencil_weight_presets(bmain, ts, false); + const bool reset_mode = (ts->gp_weightpaint->paint.brush == NULL); + BKE_brush_gpencil_weight_presets(bmain, ts, reset_mode); + + BKE_paint_toolslots_brush_validate(bmain, &ts->gp_weightpaint->paint); } /* setup other modes */ @@ -696,11 +700,13 @@ static int gpencil_vertexmode_toggle_exec(bContext *C, wmOperator *op) } if (mode == OB_MODE_VERTEX_GPENCIL) { - /* be sure we have brushes */ + /* Be sure we have brushes. */ BKE_paint_ensure(ts, (Paint **)&ts->gp_vertexpaint); - BKE_paint_toolslots_brush_validate(bmain, &ts->gp_vertexpaint->paint); - BKE_brush_gpencil_vertex_presets(bmain, ts, false); + const bool reset_mode = (ts->gp_vertexpaint->paint.brush == NULL); + BKE_brush_gpencil_vertex_presets(bmain, ts, reset_mode); + + BKE_paint_toolslots_brush_validate(bmain, &ts->gp_vertexpaint->paint); /* Ensure Palette by default. */ BKE_gpencil_palette_ensure(bmain, CTX_data_scene(C)); |