diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-11-13 16:17:27 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-11-13 16:17:27 +0400 |
commit | 11c83d843206648a33bcc8b4d754577ec0a51d2a (patch) | |
tree | 58af33c372ba5d77f68d6ed7b37e5aecd6e6c678 /source/blender/modifiers/CMakeLists.txt | |
parent | b1019a56b54294fc91293c5c43ef46d54950ae84 (diff) |
Ocean Sim modifier patch
by Matt Ebb, Hamed Zaghaghi
This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]
The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.
[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean
[2]
http://www.savetheoceansim.com
[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
Diffstat (limited to 'source/blender/modifiers/CMakeLists.txt')
-rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index e8ecc75ca60..4aedb4ae7a8 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -67,6 +67,7 @@ set(SRC intern/MOD_mirror.c intern/MOD_multires.c intern/MOD_none.c + intern/MOD_ocean.c intern/MOD_particleinstance.c intern/MOD_particlesystem.c intern/MOD_screw.c @@ -116,6 +117,10 @@ if(WITH_MOD_FLUID) add_definitions(-DWITH_MOD_FLUID) endif() +if(WITH_OCEANSIM) + add_definitions(-DWITH_OCEANSIM) +endif() + if(WITH_GAMEENGINE) # for MOD_navmesh.c add_definitions(-DWITH_GAMEENGINE) @@ -125,4 +130,8 @@ if(WITH_GAMEENGINE) ) endif() +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() + blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}") |