diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 08:21:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 08:21:58 +0400 |
| commit | 01dca44a840cb6066adb4845a5e93e0d118f239c (patch) | |
| tree | 28c5914124a0c060b0c6e3b10e2fcb0d52625490 /source/blender/modifiers | |
| parent | fb4abf2e414064449624d169e8f10708990ea0d9 (diff) | |
disable navmesh feature when building without the game engine.
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_navmesh.cpp | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index d06ada737ee..bdbc51605ba 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -119,4 +119,8 @@ if(NOT WITH_MOD_FLUID) add_definitions(-DDISABLE_ELBEEM) endif() +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +endif() + blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/modifiers/intern/MOD_navmesh.cpp b/source/blender/modifiers/intern/MOD_navmesh.cpp index 7a1c2bb6059..bc97023a58b 100644 --- a/source/blender/modifiers/intern/MOD_navmesh.cpp +++ b/source/blender/modifiers/intern/MOD_navmesh.cpp @@ -33,7 +33,10 @@ extern "C"{ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" + #include "BLI_math.h" +#include "BLI_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_modifier.h" @@ -47,13 +50,13 @@ extern "C"{ static void initData(ModifierData *md) { - NavMeshModifierData *nmmd = (NavMeshModifierData*) md; + /* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */ /* UNUSED */ } static void copyData(ModifierData *md, ModifierData *target) { - NavMeshModifierData *nmmd = (NavMeshModifierData*) md; - NavMeshModifierData *tnmmd = (NavMeshModifierData*) target; + /* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */ + /* NavMeshModifierData *tnmmd = (NavMeshModifierData*) target; */ //.todo - deep copy } @@ -62,6 +65,8 @@ static void copyData(ModifierData *md, ModifierData *target) static void (*drawFacesSolid_original)(DerivedMesh *dm, float (*partial_redraw_planes)[4], int fast, int (*setMaterial)(int, void *attribs)) = NULL;*/ +#ifdef WITH_GAMEENGINE + static void drawNavMeshColored(DerivedMesh *dm) { int a, glmode; @@ -122,9 +127,11 @@ static void navDM_drawFacesSolid(DerivedMesh *dm, //drawFacesSolid_original(dm, partial_redraw_planes, fast, setMaterial); drawNavMeshColored(dm); } +#endif /* WITH_GAMEENGINE */ static DerivedMesh *createNavMeshForVisualization(NavMeshModifierData *mmd,DerivedMesh *dm) { +#ifdef WITH_GAMEENGINE DerivedMesh *result; int maxFaces = dm->getNumFaces(dm); @@ -194,6 +201,9 @@ static DerivedMesh *createNavMeshForVisualization(NavMeshModifierData *mmd,Deriv delete trisToFacesMap; return result; +#else // WITH_GAMEENGINE + return dm; +#endif // WITH_GAMEENGINE } /* |