Changed frame numbering to only alter hashes if they are in the filename (not the...
[blender.git] / source / blender / src / sequence.c
index 22bedab6beebc9fe3b8d5083aa66c1b8c6294383..9f3be52af1bd7a7323b1eee2ed7b1d151591b72d 100644 (file)
@@ -429,7 +429,9 @@ void reload_sequence_new_file(Sequence * seq)
                strncpy(str, seq->strip->dir, FILE_MAXDIR-1);
                strncat(str, seq->strip->stripdata->name, FILE_MAXFILE-1);
 
-               BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
+               BLI_convertstringcode(str, G.sce);
+               BLI_convertstringframe(str, G.scene->r.cfra); /* TODO - is this needed? */
+               
        }
 
        if (seq->type == SEQ_IMAGE) {
@@ -1068,7 +1070,9 @@ static int seq_proxy_get_fname(Sequence * seq, int cfra, char * name)
                         G.scene->r.size);
        }
 
-       BLI_convertstringcode(name, G.sce, frameno);
+       BLI_convertstringcode(name, G.sce);
+       BLI_convertstringframe(name, frameno);
+       
 
        strcat(name, ".jpg");
 
@@ -1706,7 +1710,8 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
                        
                        strncpy(name, seq->strip->dir, FILE_MAXDIR-1);
                        strncat(name, s_elem->name, FILE_MAXFILE);
-                       BLI_convertstringcode(name, G.sce, G.scene->r.cfra);
+                       BLI_convertstringcode(name, G.sce);
+                       BLI_convertstringframe(name, G.scene->r.cfra);
                        if (!build_proxy_run) {
                                se->ibuf = seq_proxy_fetch(seq, cfra);
                        }
@@ -1735,7 +1740,8 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
                                if(seq->anim==0) {
                                        strncpy(name, seq->strip->dir, FILE_MAXDIR-1);
                                        strncat(name, seq->strip->stripdata->name, FILE_MAXFILE-1);
-                                       BLI_convertstringcode(name, G.sce, G.scene->r.cfra);
+                                       BLI_convertstringcode(name, G.sce);
+                                       BLI_convertstringframe(name, G.scene->r.cfra);
                                
                                        seq->anim = openanim(name, IB_rect);
                                }