Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2019-09-15 19:56:38 +0300
committerAntonio Vazquez <blendergit@gmail.com>2019-09-15 19:56:57 +0300
commitbdc94ef4b93eac3b6fc08ec1bc6819fb907fead4 (patch)
tree04ae0cc0666dfaf6f34db88f5dc0ff9b17a3c411
parent8e62fdbcbda6be409d7841a45e723b6e1e496a91 (diff)
Fix T69883: Deleting keyframe crashes blender
When delete in multiframe node the active frame gets NULL.
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index fbaf35890f1..a73c24d2892 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1185,7 +1185,8 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache,
}
}
- if ((gpl->actframe->framenum == gpf->framenum) || (!is_multiedit) || (overlay_multiedit)) {
+ if ((gpl->actframe) && (gpl->actframe->framenum == gpf->framenum) || (!is_multiedit) ||
+ (overlay_multiedit)) {
/* hide any blend layer */
if ((!stl->storage->simplify_blend) || (gpl->blend_mode == eGplBlendMode_Regular)) {
/* fill */