diff options
author | Peter Schlaile <peter@schlaile.de> | 2008-05-21 01:30:16 +0400 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2008-05-21 01:30:16 +0400 |
commit | 38ffd41bf06af4967dce972a282bc0e19dec527e (patch) | |
tree | 1021f40d484b9a1bff8b08a7659ce8475e9fe95a /source/blender/src/sequence.c | |
parent | 92c9ae280cd13415a40f8fc0b68ba53309350666 (diff) |
== Sequencer ==
This fixes:
[#11745] Blender crashes when changing Scenes on Sequencer`s Strips
containing:
- last_seq was set to null by scene-render
- button handling wasn't very robust (didn't check for null)
- REDRAWBUTSSCENE was missing
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r-- | source/blender/src/sequence.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 6ba53ff9b5e..1aca097e373 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -1756,6 +1756,7 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra, } } else if(seq->type == SEQ_SCENE) { // scene can be NULL after deletions int oldcfra = CFRA; + Sequence * oldseq = get_last_seq(); Scene *sce= seq->scene, *oldsce= G.scene; Render *re; RenderResult rres; @@ -1834,6 +1835,7 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra, if((G.f & G_PLAYANIM)==0) /* bad, is set on do_render_seq */ waitcursor(0); CFRA = oldcfra; + set_last_seq(oldseq); copy_to_ibuf_still(seq, se); |