diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-19 17:27:54 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-19 17:27:54 +0400 |
commit | 8abd21dbc5c3a45697d41c7f52136752b7d6876c (patch) | |
tree | 42f274bd68bcf4b3b14db69ccd04efa5d564f9f2 /source | |
parent | 13e0d584c02362332b519bfbb651040a6215ec06 (diff) |
Fix crash playing back files with saved speed control sequencer strip,
frameMap cache was not set to NULL on load.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 60d4ce4994f..66111d21ccb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4283,8 +4283,12 @@ static void direct_link_scene(FileData *fd, Scene *sce) seq->plugin= newdataadr(fd, seq->plugin); seq->effectdata= newdataadr(fd, seq->effectdata); - if (seq->type & SEQ_EFFECT) { + if(seq->type & SEQ_EFFECT) seq->flag |= SEQ_EFFECT_NOT_LOADED; + + if(seq->type == SEQ_SPEED) { + SpeedControlVars *s= seq->effectdata; + s->frameMap= NULL; } seq->strip= newdataadr(fd, seq->strip); |