diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-31 17:18:14 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-31 17:18:14 +0400 |
| commit | cd338a4130011ed9eccc7b131b11e4261b9dc269 (patch) | |
| tree | 767bb3edaa08fef0bb6ff039fced376f9a00e9c3 /source/blender/editors/physics | |
| parent | 0a37e6ab976344818483df899b4fc44aedb30613 (diff) | |
| parent | a664e779ac8be0f926221d4c064394f9b3b6a801 (diff) | |
Merge with trunk r41411
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 3fc05684fc9..4d43c618568 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -46,8 +46,8 @@ set(SRC physics_intern.h ) -if(NOT WITH_MOD_FLUID) - add_definitions(-DDISABLE_ELBEEM) +if(WITH_MOD_FLUID) + add_definitions(-DWITH_MOD_FLUID) endif() if(WITH_OPENMP) diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index f0c327b9279..6e88d477d9c 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -85,7 +85,7 @@ #include "physics_intern.h" // own include /* enable/disable overall compilation */ -#ifndef DISABLE_ELBEEM +#ifdef WITH_MOD_FLUID #include "WM_api.h" @@ -1111,7 +1111,7 @@ void fluidsimFreeBake(Object *UNUSED(ob)) /* not implemented yet */ } -#else /* DISABLE_ELBEEM */ +#else /* WITH_MOD_FLUID */ /* compile dummy functions for disabled fluid sim */ @@ -1135,7 +1135,7 @@ static int fluidsimBake(bContext *UNUSED(C), ReportList *UNUSED(reports), Object return 0; } -#endif /* DISABLE_ELBEEM */ +#endif /* WITH_MOD_FLUID */ /***************************** Operators ******************************/ |