diff options
author | Antonioya <blendergit@gmail.com> | 2019-05-06 21:34:24 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2019-05-06 21:34:24 +0300 |
commit | 6da953ad1dbc1c0fb13ffb50ac896e9fcee3801b (patch) | |
tree | 36023b9d1cb72ae8e13991ad459ee3ccf2208266 /source/blender/editors/gpencil/gpencil_merge.c | |
parent | fb3e138ceedab82bc7c743c8cb4790fbadbb9986 (diff) |
GPencil: Verify Brush has GPencil data
This avoid errors in old files.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_merge.c')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c index 9d3c2a6e271..93d8555e014 100644 --- a/source/blender/editors/gpencil/gpencil_merge.c +++ b/source/blender/editors/gpencil/gpencil_merge.c @@ -110,7 +110,7 @@ static bGPDstroke *gpencil_prepare_stroke(bContext *C, wmOperator *op, int totpo Paint *paint = &ts->gp_paint->paint; /* if not exist, create a new one */ - if (paint->brush == NULL) { + if ((paint->brush == NULL) || (paint->brush->gpencil_settings == NULL)) { /* create new brushes */ BKE_brush_gpencil_presets(C); } |