missed out on some BLI_convertstringcode's, also found that playing relative quicktim...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 May 2008 15:02:48 +0000 (15:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 May 2008 15:02:48 +0000 (15:02 +0000)
source/blender/python/api2_2x/sceneRender.c
source/blender/quicktime/apple/quicktime_export.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

index d99861955114225815c42430467d5cc5392c64f6..db5ad669255bf43b6fcd90a8407625bb4fb329f9 100644 (file)
@@ -598,8 +598,7 @@ PyObject *RenderData_Play( BPy_RenderData * self )
        if( self->renderContext->imtype == R_QUICKTIME ) {
 
                strcpy( file, self->renderContext->pic );
        if( self->renderContext->imtype == R_QUICKTIME ) {
 
                strcpy( file, self->renderContext->pic );
-               BLI_convertstringcode( file, (char *) self->scene,
-                                      self->renderContext->cfra );
+               BLI_convertstringcode( file, G.sce );
                BLI_make_existing_file( file );
                if( BLI_strcasecmp( file + strlen( file ) - 4, ".mov" ) ) {
                        sprintf( txt, "%04d_%04d.mov",
                BLI_make_existing_file( file );
                if( BLI_strcasecmp( file + strlen( file ) - 4, ".mov" ) ) {
                        sprintf( txt, "%04d_%04d.mov",
index a49a9a2fdc81a81e927853705ca76fbfc3a6cca7..736bb4dd5843db20f723e68b0299414d5e2ad174 100644 (file)
@@ -428,7 +428,7 @@ void makeqtstring (char *string) {
        if (string==0) return;
 
        strcpy(string, G.scene->r.pic);
        if (string==0) return;
 
        strcpy(string, G.scene->r.pic);
-       BLI_convertstringcode(string, G.sce, G.scene->r.cfra);
+       BLI_convertstringcode(string, G.sce);
 
        BLI_make_existing_file(string);
 
 
        BLI_make_existing_file(string);
 
index 1496f7c6ad3ec141bbc15935c3962ea891bdba47..8817bc98886e17acc76abeecb6a48312110b6061 100644 (file)
@@ -579,7 +579,7 @@ int main(int argc, char** argv)
                                                // base the actuator filename with respect
                                                // to the original file working directory
                                                strcpy(basedpath, exitstring.Ptr());
                                                // base the actuator filename with respect
                                                // to the original file working directory
                                                strcpy(basedpath, exitstring.Ptr());
-                                               BLI_convertstringcode(basedpath, pathname, 0);
+                                               BLI_convertstringcode(basedpath, pathname);
                                                
                                                bfd = load_game_data(basedpath);
                                        }
                                                
                                                bfd = load_game_data(basedpath);
                                        }