diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-06-27 16:58:45 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-07-13 18:13:17 +0300 |
| commit | 78c7e7e3bc26896aae0334362ab91a9025e22a7d (patch) | |
| tree | 548e698c436d9a28a6c496fd1e371c3833b3f228 | |
| parent | e2e9df1520fb23f55f1ebebb37e0e53d8d6b012d (diff) | |
Fix T78337: Fix crash when use GPencil merge without materials
If the object hadn't material, the index of material was negative.
| -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 e71bf2098dd..6417d31d894 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(ob->actcol - 1, totpoints, brush->size); + bGPDstroke *gps = BKE_gpencil_stroke_new(max(ob->actcol - 1, 0), totpoints, brush->size); gps->flag |= GP_STROKE_SELECT; if (cyclic) { |