Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2015-02-27 12:53:45 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-03-23 14:23:11 +0300
commit4f7bc3a7aabbe0d4a32b5ae389c86dba9b61e63d (patch)
treed2254440960878562812b010663918b4d5919012 /source/gameengine/GamePlayer
parent8618cd39d6e83d5c8e3d24abd6d9787679f9d4c5 (diff)
Fix for circular linker dependency with cache code library.
The `bf_pointcache_alembic` code is a separate library, to avoid muddling up core code with alembic includes and preprocessor defines. Alembic stuff only belongs strictly into alembic code and can be disabled cleanly. The `bf_pointcache` and `bf_pointcache_alembic` libraries had a circular dependency, because the alembic implementation functions were called directly. Now there is a "Factory" class to abstract the creation of concrete implementations for readers and writers. `bf_pointcache_alembic` defines this factory and is registered //outside// of the core `bf_pointcache` lib, so there is no linker circularity.
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r--source/gameengine/GamePlayer/ghost/CMakeLists.txt1
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_ghost.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index a1bc7e88840..dfa115e085c 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -46,6 +46,7 @@ set(INC
../../../blender/imbuf
../../../blender/makesdna
../../../blender/makesrna
+ ../../../blender/pointcache
../../../../intern/container
../../../../intern/ghost
../../../../intern/glew-mx
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 915fe614957..5590648ac03 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -79,6 +79,8 @@ extern "C"
#include "IMB_imbuf.h"
#include "IMB_moviecache.h"
+
+#include "PTC_api.h"
#ifdef __APPLE__
int GHOST_HACK_getFirstFile(char buf[]);
@@ -451,6 +453,7 @@ int main(int argc, char** argv)
RNA_init();
init_nodesystem();
+ PTC_alembic_init();
initglobals();