[Bf-blender-cvs] [3121941] master: Fix BGE compilation after recent renames in BKE_image (tsst...).

Bastien Montagne noreply at git.blender.org
Sat Jan 24 14:58:33 CET 2015


Commit: 31219415d6c5e9db72b362ac3badff52ea203480
Author: Bastien Montagne
Date:   Sat Jan 24 14:57:57 2015 +0100
Branches: master
https://developer.blender.org/rB31219415d6c5e9db72b362ac3badff52ea203480

Fix BGE compilation after recent renames in BKE_image (tsst...).

===================================================================

M	source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
M	source/gameengine/GamePlayer/common/GPC_Canvas.cpp

===================================================================

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
index 31f3b1b..5bb2d58 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
@@ -350,7 +350,7 @@ void KX_BlenderCanvas::MakeScreenShot(const char *filename)
 		char path[FILE_MAX];
 		BLI_strncpy(path, filename, sizeof(path));
 		BLI_path_abs(path, G.main->name);
-		BKE_add_image_extension_from_type(path, im_format.imtype);
+		BKE_image_path_ensure_ext_from_imtype(path, im_format.imtype);
 
 		/* create and save imbuf */
 		ImBuf *ibuf = IMB_allocImBuf(dumpsx, dumpsy, 24, 0);
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
index be7cf66..c88d55d 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
@@ -180,7 +180,7 @@ MakeScreenShot(
 	char path[FILE_MAX];
 	BLI_strncpy(path, filename, sizeof(path));
 	BLI_path_abs(path, G.main->name);
-	BKE_add_image_extension_from_type(path, im_format.imtype);
+	BKE_image_path_ensure_ext_from_imtype(path, im_format.imtype);
 
 	// create and save imbuf 
 	ImBuf *ibuf = IMB_allocImBuf(GetWidth(), GetHeight(), 24, 0);




More information about the Bf-blender-cvs mailing list