[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16745] trunk/blender/source/gameengine/ GamePlayer/ghost: Bugfix: the game player did not initialize tiff and quicktime, so loading
Brecht Van Lommel
brecht at blender.org
Fri Sep 26 16:54:21 CEST 2008
Revision: 16745
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16745
Author: blendix
Date: 2008-09-26 16:54:21 +0200 (Fri, 26 Sep 2008)
Log Message:
-----------
Bugfix: the game player did not initialize tiff and quicktime, so loading
those file formats did not work. Also made sure G.order is initialized as
otherwise some reading tiff goes wrong.
Modified Paths:
--------------
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2008-09-26 13:47:41 UTC (rev 16744)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2008-09-26 14:54:21 UTC (rev 16745)
@@ -57,6 +57,7 @@
#include "BLO_readfile.h"
#include "BKE_global.h"
#include "BKE_main.h"
+#include "IMB_imbuf.h"
#include "DNA_scene_types.h"
#ifdef __cplusplus
}
@@ -754,8 +755,6 @@
void GPG_Application::exitEngine()
{
- GPU_extensions_exit();
-
if (m_ketsjiengine)
{
stopEngine();
@@ -803,6 +802,12 @@
m_canvas = 0;
}
+ libtiff_exit();
+#ifdef WITH_QUICKTIME
+ quicktime_exit();
+#endif
+ GPU_extensions_exit();
+
m_exitRequested = 0;
m_engineInitialized = false;
}
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2008-09-26 13:47:41 UTC (rev 16744)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2008-09-26 14:54:21 UTC (rev 16745)
@@ -53,6 +53,7 @@
{
#endif // __cplusplus
#include "MEM_guardedalloc.h"
+#include "BKE_blender.h"
#include "BKE_global.h"
#include "BKE_icons.h"
#include "BKE_node.h"
@@ -60,6 +61,7 @@
#include "DNA_scene_types.h"
#include "BLO_readfile.h"
#include "BLO_readblenfile.h"
+#include "IMB_imbuf.h"
int GHOST_HACK_getFirstFile(char buf[]);
@@ -335,7 +337,15 @@
init_nodesystem();
+ initglobals();
+
GEN_init_messaging_system();
+
+#ifdef WITH_QUICKTIME
+ quicktime_init();
+#endif
+
+ libtiff_init();
// Parse command line options
#ifndef NDEBUG
More information about the Bf-blender-cvs
mailing list