diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-06-27 22:07:20 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-06-27 22:07:20 +0300 |
| commit | 4ea92f775e31faec01cbe098e245fe67cb4b407c (patch) | |
| tree | 98694e9c2491965792ddb5df194a37a63cd51d85 /source/blender/editors/gpencil | |
| parent | ff820496422da1b71352e6e55d68541fc6d6e2b3 (diff) | |
Fix compile error in recent commit
This was introduced in rBd7b10e5b740fe2.
Diffstat (limited to 'source/blender/editors/gpencil')
| -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 6417d31d894..e609890b23c 100644 --- a/source/blender/editors/gpencil/gpencil_merge.c +++ b/source/blender/editors/gpencil/gpencil_merge.c @@ -132,7 +132,7 @@ static bGPDstroke *gpencil_prepare_stroke(bContext *C, wmOperator *op, int totpo bGPDframe *gpf = BKE_gpencil_layer_frame_get(gpl, CFRA, add_frame_mode); /* stroke */ - bGPDstroke *gps = BKE_gpencil_stroke_new(max(ob->actcol - 1, 0), totpoints, brush->size); + bGPDstroke *gps = BKE_gpencil_stroke_new(MAX2(ob->actcol - 1, 0), totpoints, brush->size); gps->flag |= GP_STROKE_SELECT; if (cyclic) { |