diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-05 07:31:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-05 07:31:25 +0300 |
| commit | 8b31f6fb2169e7163767e382adbef13587305aca (patch) | |
| tree | 23609feb5da08a39f8009eb4390f69e6205fc2b1 /source/blender/editors/gpencil/gpencil_edit.c | |
| parent | 8fcc04edce53c5b3b01bf392e1667878ebcce0ef (diff) | |
Paint: add BKE_paint_ensure to initialize toolsettings
Each mode had its own logic for initializing paint structs,
move to a single function.
Also remove "BKE_brush_get_gpencil_paint", entering grease pencil
mode is responsible for ensuring the data is created.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 12dc3451902..fc50fa7359f 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -319,7 +319,8 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op) if (mode == OB_MODE_GPENCIL_PAINT) { /* be sure we have brushes */ - Paint *paint = BKE_brush_get_gpencil_paint(ts); + BKE_paint_ensure(ts, (Paint **)&ts->gp_paint); + Paint *paint = &ts->gp_paint->paint; /* if not exist, create a new one */ if (paint->brush == NULL) { BKE_brush_gpencil_presets(C); |