diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 13:08:57 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 13:08:57 +0300 |
| commit | edcec3aee03da94936c9f7167a51b63ff62ff07d (patch) | |
| tree | 1763f0f25cd6425d64c827b2b86b6a035755c684 /source/blender/editors/gpencil | |
| parent | 79003fa0c415abce4bbc6f186e855175fd1b61b5 (diff) | |
| parent | db0121a0099836113e7babe7f006e99e4f6ed69f (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 09ff24f05fc..92d69ecec41 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1963,6 +1963,9 @@ static Brush *gp_get_default_eraser(Main *bmain, ToolSettings *ts) Paint *paint = &ts->gp_paint->paint; Brush *brush_old = paint->brush; for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) { + if (brush->gpencil_settings == NULL) { + continue; + } if ((brush->ob_mode == OB_MODE_PAINT_GPENCIL) && (brush->gpencil_tool == GPAINT_TOOL_ERASE)) { /* save first eraser to use later if no default */ if (brush_dft == NULL) { |