[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14679] trunk/blender/source: 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.

[Campbell Barton]

Revision: 14679
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14679
Author:   campbellbarton
Date:     2008-05-04 17:02:48 +0200 (Sun, 04 May 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/sceneRender.c
    trunk/blender/source/blender/quicktime/apple/quicktime_export.c
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneRender.c	2008-05-04 14:14:54 UTC (rev 14678)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.c	2008-05-04 15:02:48 UTC (rev 14679)
@@ -598,8 +598,7 @@
 	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",

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_export.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_export.c	2008-05-04 14:14:54 UTC (rev 14678)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c	2008-05-04 15:02:48 UTC (rev 14679)
@@ -428,7 +428,7 @@
 	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);
 

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2008-05-04 14:14:54 UTC (rev 14678)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2008-05-04 15:02:48 UTC (rev 14679)
@@ -579,7 +579,7 @@
 						// 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);
 					}