[Bf-blender-cvs] [bdc94ef4b93] master: Fix T69883: Deleting keyframe crashes blender
Antonio Vazquez
noreply at git.blender.org
Sun Sep 15 18:57:01 CEST 2019
Commit: bdc94ef4b93eac3b6fc08ec1bc6819fb907fead4
Author: Antonio Vazquez
Date: Sun Sep 15 18:56:38 2019 +0200
Branches: master
https://developer.blender.org/rBbdc94ef4b93eac3b6fc08ec1bc6819fb907fead4
Fix T69883: Deleting keyframe crashes blender
When delete in multiframe node the active frame gets NULL.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
===================================================================
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 */
More information about the Bf-blender-cvs
mailing list