Commit: 4ea92f775e31faec01cbe098e245fe67cb4b407c
Author: Jacques Lucke
Date: Sat Jun 27 21:07:20 2020 +0200
Branches: master
https://developer.blender.org/rB4ea92f775e31faec01cbe098e245fe67cb4b407c
Fix compile error in recent commit
This was introduced in rBd7b10e5b740fe2.
===================================================================
M source/blender/editors/gpencil/gpencil_merge.c
===================================================================
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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
