diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
| commit | e52beb373323122f6d706e887a8ee3e2c58beb2e (patch) | |
| tree | 0e409009d8aa4df733fe50dee504ae361040a171 /source/blender/editors/gpencil | |
| parent | c713e9c4724f2f75e28eb421021ed0428e919aab (diff) | |
| parent | ab695c32974fde8720c04dff47d240b7fa0f8151 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index fca9a2c10f2..9d183222c2d 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -1062,7 +1062,7 @@ static int gp_brush_remove_exec(bContext *C, wmOperator *op) if (ELEM(NULL, ts, brush)) return OPERATOR_CANCELLED; - if (BLI_listbase_count_ex(&ts->gp_brushes, 2) < 2) { + if (BLI_listbase_count_at_most(&ts->gp_brushes, 2) < 2) { BKE_report(op->reports, RPT_ERROR, "Grease Pencil needs a brush, unable to delete the last one"); return OPERATOR_CANCELLED; } @@ -1420,7 +1420,7 @@ static int gp_palette_remove_exec(bContext *C, wmOperator *op) if (ELEM(NULL, gpd, palette)) return OPERATOR_CANCELLED; - if (BLI_listbase_count_ex(&gpd->palettes, 2) < 2) { + if (BLI_listbase_count_at_most(&gpd->palettes, 2) < 2) { BKE_report(op->reports, RPT_ERROR, "Grease Pencil needs a palette, unable to delete the last one"); return OPERATOR_CANCELLED; } |