[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20385] trunk/blender/source/blender/src/ sequence.c: == Sequencer ==

[Peter Schlaile]

Revision: 20385
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20385
Author:   schlaile
Date:     2009-05-24 21:54:35 +0200 (Sun, 24 May 2009)

Log Message:
-----------
== Sequencer ==

This fixes a stupid mistake in proxy handling with custom files:
CFRA not calculated correctly for proxy...

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c 2009-05-24 19:21:54 UTC (rev 
20384)
+++ trunk/blender/source/blender/src/sequence.c 2009-05-24 19:54:35 UTC (rev 
20385)
@@ -1122,6 +1122,8 @@
        }
 
        if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
+               TStripElem * tse = give_tstripelem(seq, cfra);
+               int frameno = tse->nr + seq->anim_startofs;
                if (!seq->strip->proxy->anim) {
                        if (!seq_proxy_get_fname(seq, cfra, name)) {
                                return 0;
@@ -1132,7 +1134,8 @@
                if (!seq->strip->proxy->anim) {
                        return 0;
                }
-               return IMB_anim_absolute(seq->strip->proxy->anim, cfra);
+
+               return IMB_anim_absolute(seq->strip->proxy->anim, frameno);
        }
 
        if (!seq_proxy_get_fname(seq, cfra, name)) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs