diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-10-31 11:25:13 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-10-31 11:25:13 +0300 |
commit | fe90bb86c0284065fe671d8d49c411cfa1c7c363 (patch) | |
tree | 5b4903bb791e2cdd19e68d2e4c82b51eaf6404a6 /source/blender | |
parent | 517ff40b124bc9d1324ccf7561a59ac51bf86602 (diff) | |
parent | 9af6c041e8fc2f32d9db53b7821111ca724ead17 (diff) |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_interpolate.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 320357dc678..3a3a9bde38b 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -235,7 +235,9 @@ static bool gpencil_interpolate_check_todo(bContext *C, bGPdata *gpd) /* get final stroke to interpolate */ fFrame = BLI_findindex(&gpl->actframe->strokes, gps_from); - gps_to = BLI_findlink(&gpl->actframe->next->strokes, fFrame); + gps_to = (gpl->actframe->next != NULL) ? + BLI_findlink(&gpl->actframe->next->strokes, fFrame) : + NULL; if (gps_to == NULL) { continue; } @@ -273,6 +275,9 @@ static void gpencil_interpolate_set_points(bContext *C, tGPDinterpolate *tgpi) if (!BKE_gpencil_layer_is_editable(gpl) || (gpl->actframe == NULL)) { continue; } + if ((gpl->actframe == NULL) || (gpl->actframe->next == NULL)) { + continue; + } /* create temp data for each layer */ tgpil = MEM_callocN(sizeof(tGPDinterpolate_layer), "GPencil Interpolate Layer"); |