[Bf-blender-cvs] [8346417d092] master: Fix crash displaying the sequencer without a valid 'scene->ed'
Campbell Barton
noreply at git.blender.org
Thu Jul 8 02:16:24 CEST 2021
Commit: 8346417d09240c129c5688560180aec37bc4c89a
Author: Campbell Barton
Date: Thu Jul 8 10:06:11 2021 +1000
Branches: master
https://developer.blender.org/rB8346417d09240c129c5688560180aec37bc4c89a
Fix crash displaying the sequencer without a valid 'scene->ed'
Regression in 45d54ea67f9440d1c4ef89b3257ee92159de2599
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 82283b03fc8..8371a634a78 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2479,13 +2479,14 @@ void draw_timeline_seq_display(const bContext *C, ARegion *region)
const SpaceSeq *sseq = CTX_wm_space_seq(C);
View2D *v2d = ®ion->v2d;
- UI_view2d_view_ortho(v2d);
- draw_cache_view(C);
-
- if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) {
- draw_overlap_frame_indicator(scene, v2d);
+ if (scene->ed != NULL) {
+ UI_view2d_view_ortho(v2d);
+ draw_cache_view(C);
+ if (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) {
+ draw_overlap_frame_indicator(scene, v2d);
+ }
+ UI_view2d_view_restore(C);
}
- UI_view2d_view_restore(C);
ED_time_scrub_draw_current_frame(region, scene, !(sseq->flag & SEQ_DRAWFRAMES), true);
UI_view2d_scrollers_draw(v2d, NULL);
More information about the Bf-blender-cvs
mailing list