missed out on some BLI_convertstringcode's, also found that playing relative quicktime paths from the python api never worked, was using the 'Scene' type cast to a char.

3 files changed, 3 insertions, 4 deletions

diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index d9986195511..db5ad669255 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -598,8 +598,7 @@ PyObject *RenderData_Play( BPy_RenderData * self )
 	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",
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c
index a49a9a2fdc8..736bb4dd584 100644
--- a/source/blender/quicktime/apple/quicktime_export.c
+++ b/source/blender/quicktime/apple/quicktime_export.c
@@ -428,7 +428,7 @@ void makeqtstring (char *string) {
 	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);
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 1496f7c6ad3..8817bc98886 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -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());
-						BLI_convertstringcode(basedpath, pathname, 0);
+						BLI_convertstringcode(basedpath, pathname);
 						
 						bfd = load_game_data(basedpath);
 					}