Revision: 30534
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30534
Author: schlaile
Date: 2010-07-20 14:22:45 +0200 (Tue, 20 Jul 2010)
Log Message:
-----------
== Sequencer ==
Cutting effect strips (esp multicam) didn't free endstill tstripdata.
Doesn't sound like much of a problem, but those can get big on large
timelines. So every cut eating 3 MB of memory doesn't leave much room
for editing decisions :)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-07-20
12:20:55 UTC (rev 30533)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-07-20
12:22:45 UTC (rev 30534)
@@ -1142,7 +1142,7 @@
Strip * s = seq->strip;
if (cfra < seq->start) {
se = s->tstripdata_startstill;
- if (seq->startstill > s->startstill) {
+ if (seq->startstill != s->startstill) {
free_tstripdata(s->startstill,
s->tstripdata_startstill);
se = 0;
@@ -1159,7 +1159,7 @@
} else if (cfra > seq->start + seq->len-1) {
se = s->tstripdata_endstill;
- if (seq->endstill > s->endstill) {
+ if (seq->endstill != s->endstill) {
free_tstripdata(s->endstill,
s->tstripdata_endstill);
se = 0;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2010-07-20 12:20:55 UTC (rev 30533)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2010-07-20 12:22:45 UTC (rev 30534)
@@ -789,6 +789,7 @@
reload_sequence_new_file(scene, seq, FALSE);
calc_sequence(scene, seq);
+ new_tstripdata(seq);
if (!skip_dup) {
/* Duplicate AFTER the first change */
@@ -828,6 +829,7 @@
reload_sequence_new_file(scene, seqn, FALSE);
calc_sequence(scene, seqn);
+ new_tstripdata(seqn);
}
return seqn;
}
@@ -878,6 +880,7 @@
}
calc_sequence(scene, seq);
+ new_tstripdata(seq);
if (!skip_dup) {
/* Duplicate AFTER the first change */
@@ -913,6 +916,7 @@
}
calc_sequence(scene, seqn);
+ new_tstripdata(seqn);
}
return seqn;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
