[Bf-blender-cvs] [ee07bfa3a0f] master: Fix crash transforming sequences
Campbell Barton
noreply at git.blender.org
Tue Mar 23 05:11:57 CET 2021
Commit: ee07bfa3a0fb5e12e6824e86b474e2625774e289
Author: Campbell Barton
Date: Tue Mar 23 15:08:26 2021 +1100
Branches: master
https://developer.blender.org/rBee07bfa3a0fb5e12e6824e86b474e2625774e289
Fix crash transforming sequences
Regression in 3d9ee83d88186248fb66823662a04d1a0429e1ae
===================================================================
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 63449193cba..e4afb27dd2e 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1821,6 +1821,9 @@ static ImBuf *sequencer_get_scope(Scene *scene, SpaceSeq *sseq, ImBuf *ibuf, boo
static bool sequencer_draw_get_transform_preview(SpaceSeq *sseq, Scene *scene)
{
Sequence *last_seq = SEQ_select_active_get(scene);
+ if (last_seq == NULL) {
+ return false;
+ }
return (G.moving & G_TRANSFORM_SEQ) && (last_seq->flag & SELECT) &&
((last_seq->flag & SEQ_LEFTSEL) || (last_seq->flag & SEQ_RIGHTSEL)) &&
@@ -1830,6 +1833,8 @@ static bool sequencer_draw_get_transform_preview(SpaceSeq *sseq, Scene *scene)
static int sequencer_draw_get_transform_preview_frame(Scene *scene)
{
Sequence *last_seq = SEQ_select_active_get(scene);
+ /* #sequencer_draw_get_transform_preview must already have been called. */
+ BLI_assert(last_seq != NULL);
int preview_frame;
if (last_seq->flag & SEQ_RIGHTSEL) {
More information about the Bf-blender-cvs
mailing list