diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-26 18:54:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-26 18:54:21 +0400 |
commit | f13bd6ef3ca908e1bec36e015c309225f18751e3 (patch) | |
tree | be7e7fbe6a7d8b0098f105a196c37984241ea783 /source | |
parent | 1206061ed431a37c31271364c0ed346809c3abc3 (diff) |
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.
Diffstat (limited to 'source')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 9 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 4cd5184fee1..a9196a1a5e3 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -57,6 +57,7 @@ extern "C" #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::stopEngine() void GPG_Application::exitEngine() { - GPU_extensions_exit(); - if (m_ketsjiengine) { stopEngine(); @@ -803,6 +802,12 @@ void GPG_Application::exitEngine() m_canvas = 0; } + libtiff_exit(); +#ifdef WITH_QUICKTIME + quicktime_exit(); +#endif + GPU_extensions_exit(); + m_exitRequested = 0; m_engineInitialized = false; } diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 4dfbbab7cd3..9700e6387f2 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -53,6 +53,7 @@ extern "C" { #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 @@ extern "C" #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 @@ int main(int argc, char** argv) init_nodesystem(); + initglobals(); + GEN_init_messaging_system(); + +#ifdef WITH_QUICKTIME + quicktime_init(); +#endif + + libtiff_init(); // Parse command line options #ifndef NDEBUG |