[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28283] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix crash playing back files with saved speed control sequencer strip,
Brecht Van Lommel
brecht at blender.org
Mon Apr 19 15:27:55 CEST 2010
Revision: 28283
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28283
Author: blendix
Date: 2010-04-19 15:27:54 +0200 (Mon, 19 Apr 2010)
Log Message:
-----------
Fix crash playing back files with saved speed control sequencer strip,
frameMap cache was not set to NULL on load.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-04-19 11:24:22 UTC (rev 28282)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-04-19 13:27:54 UTC (rev 28283)
@@ -4283,8 +4283,12 @@
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);
More information about the Bf-blender-cvs
mailing list