Commit: f66c80f7043259fd6357590043e2021f210f0dbf
Author: Antonio Vazquez
Date: Sun Sep 15 18:56:38 2019 +0200
Branches: temp-lanpr-cleanup
https://developer.blender.org/rBf66c80f7043259fd6357590043e2021f210f0dbf
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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
