[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45205] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: reload_sequence_new_file now works with movie clip strips as well
Sergey Sharybin
sergey.vfx at gmail.com
Tue Mar 27 10:54:54 CEST 2012
Revision: 45205
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45205
Author: nazgul
Date: 2012-03-27 08:54:37 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
reload_sequence_new_file now works with movie clip strips as well
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-03-27 05:03:23 UTC (rev 45204)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-03-27 08:54:37 UTC (rev 45205)
@@ -643,7 +643,7 @@
int prev_startdisp=0, prev_enddisp=0;
/* note: don't rename the strip, will break animation curves */
- if (ELEM5(seq->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_SCENE, SEQ_META)==0) {
+ if (ELEM6(seq->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_SCENE, SEQ_META, SEQ_MOVIECLIP)==0) {
return;
}
@@ -693,6 +693,15 @@
seq->len = 0;
}
break;
+ case SEQ_MOVIECLIP:
+ seq->len = BKE_movieclip_get_duration(seq->clip);
+
+ seq->len -= seq->anim_startofs;
+ seq->len -= seq->anim_endofs;
+ if (seq->len < 0) {
+ seq->len = 0;
+ }
+ break;
case SEQ_SOUND:
#ifdef WITH_AUDASPACE
if (!seq->sound)
More information about the Bf-blender-cvs
mailing list