diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-11 18:13:04 +0400 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-11 18:13:04 +0400 |
| commit | b988a2abf815d74aba7bd9bf910b712735ea8f53 (patch) | |
| tree | 0b2bf75ea63641014a3441c09d47d9911201d2c7 /source/gameengine | |
| parent | 3d3f6b1ddc655a070c20e41abec2e7850fd266e6 (diff) | |
Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons updated but not tested.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 4b2d828fe81..9d8b1781869 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -59,7 +59,6 @@ set(INC_SYS ${GLEW_INCLUDE_PATH} ../../../extern/recastnavigation/Recast/Include ../../../extern/recastnavigation/Detour/Include - ../../blender/editors/include ) set(SRC diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 26990f6e82b..f72c98fb4bf 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -38,9 +38,7 @@ extern "C" { #include "BKE_customdata.h" #include "BKE_cdderivedmesh.h" #include "BKE_DerivedMesh.h" - - -#include "ED_navmesh_conversion.h" +#include "BKE_navmesh_conversion.h" } #include "KX_PythonInit.h" diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 7c9785c24e7..9b453ed76d5 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -21,7 +21,6 @@ incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' incs += ' #source/gameengine/Physics/Dummy' incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu' incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include' -incs += ' #source/blender/editors/include' incs += ' ' + env['BF_BULLET_INC'] incs += ' ' + env['BF_OPENGL_INC'] |