[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41849] branches/bmesh/blender: svn merge -r41779:41847 ^/trunk/blender

Campbell Barton ideasman42 at gmail.com
Tue Nov 15 03:58:06 CET 2011 

Revision: 41849
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41849
Author:   campbellbarton
Date:     2011-11-15 02:58:06 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
svn merge -r41779:41847  ^/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41779

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/GNUmakefile
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
    branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
    branches/bmesh/blender/build_files/scons/config/darwin-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
    branches/bmesh/blender/build_files/scons/config/linux-config.py
    branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
    branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
    branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/extern/libmv/CMakeLists.txt
    branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv-capi.cpp
    branches/bmesh/blender/extern/libmv/libmv-capi.h
    branches/bmesh/blender/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
    branches/bmesh/blender/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
    branches/bmesh/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/bmesh/blender/intern/cycles/blender/addon/engine.py
    branches/bmesh/blender/intern/cycles/blender/addon/properties.py
    branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
    branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
    branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
    branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
    branches/bmesh/blender/intern/cycles/kernel/osl/nodes/stdosl.h
    branches/bmesh/blender/intern/cycles/kernel/osl/osl_closures.cpp
    branches/bmesh/blender/intern/cycles/kernel/osl/osl_closures.h
    branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/bmesh/blender/intern/cycles/kernel/svm/svm_bsdf.h
    branches/bmesh/blender/intern/cycles/kernel/svm/svm_closure.h
    branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h
    branches/bmesh/blender/intern/cycles/render/nodes.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/bmesh/blender/intern/itasc/kdl/chain.hpp
    branches/bmesh/blender/intern/itasc/kdl/tree.hpp
    branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_translation.c
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_camera.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_dynamicpaint.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
    branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenkernel/SConscript
    branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh_validate.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
    branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
    branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
    branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
    branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
    branches/bmesh/blender/source/blender/editors/object/object_bake.c
    branches/bmesh/blender/source/blender/editors/object/object_constraint.c
    branches/bmesh/blender/source/blender/editors/object/object_intern.h
    branches/bmesh/blender/source/blender/editors/object/object_modifier.c
    branches/bmesh/blender/source/blender/editors/object/object_ops.c
    branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
    branches/bmesh/blender/source/blender/editors/physics/dynamicpaint_ops.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_toolbar.c
    branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
    branches/bmesh/blender/source/blender/editors/space_info/info_stats.c
    branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
    branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/bmesh/blender/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/bmesh/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
    branches/bmesh/blender/source/blender/makesrna/SConscript
    branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_context.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
    branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
    branches/bmesh/blender/source/blender/modifiers/MOD_modifiertypes.h
    branches/bmesh/blender/source/blender/modifiers/SConscript
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
    branches/bmesh/blender/source/blender/nodes/NOD_socket.h
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_background.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_emission.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_fresnel.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_holdout.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_light_path.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output_material.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output_world.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
    branches/bmesh/blender/source/blender/render/CMakeLists.txt
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
    branches/bmesh/blender/source/blender/windowmanager/WM_api.h
    branches/bmesh/blender/source/blender/windowmanager/WM_keymap.h
    branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Added Paths:
-----------
    branches/bmesh/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/esm_region_tracker.h
    branches/bmesh/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
    branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
    branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_oren_nayar.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_ocean.h
    branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
    branches/bmesh/blender/source/blender/render/intern/include/texture_ocean.h
    branches/bmesh/blender/source/blender/render/intern/source/texture_ocean.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-41779
   + /trunk/blender:39992-41847

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/CMakeLists.txt	2011-11-15 02:58:06 UTC (rev 41849)
@@ -171,6 +171,7 @@
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
 option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
 mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
+option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
@@ -218,6 +219,7 @@
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
 set(CYCLES_CUDA_BINARIES_ARCH		sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -285,6 +287,10 @@
 						"line if youre a developer who wants to add support.")
 endif()
 
+if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
+	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
+endif()
+
 # may as well build python module without a UI
 if(WITH_PYTHON_MODULE)
 	set(WITH_HEADLESS ON)
@@ -1562,6 +1568,7 @@
 	info_cfg_option(WITH_MOD_BOOLEAN)
 	info_cfg_option(WITH_MOD_DECIMATE)
 	info_cfg_option(WITH_MOD_FLUID)
+	info_cfg_option(WITH_MOD_OCEANSIM)
 
 	info_cfg_text("")
 

Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/GNUmakefile	2011-11-15 02:58:06 UTC (rev 41849)
@@ -34,8 +34,11 @@
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=
 
+ifndef BUILD_CMAKE_ARGS
+	BUILD_CMAKE_ARGS:=
+endif
+
 ifndef BUILD_DIR
 	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
 endif
@@ -123,6 +126,7 @@
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
 	@echo ""
 	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
+	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
 	@echo ""
 	@echo ""
 	@echo "Project Files for IDE's"

Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/SConstruct	2011-11-15 02:58:06 UTC (rev 41849)
@@ -254,6 +254,7 @@
     target_env_defs['WITH_BF_BINRELOC'] = False
     target_env_defs['BF_BUILDINFO'] = False
     target_env_defs['WITH_BF_FLUID'] = False
+    target_env_defs['WITH_BF_OCEANSIM'] = False
     target_env_defs['WITH_BF_DECIMATE'] = False
     target_env_defs['WITH_BF_BOOLEAN'] = False
     target_env_defs['WITH_BF_PYTHON'] = False
@@ -329,7 +330,12 @@
 if env['WITH_BF_FLUID'] == 1:
     env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
 
+# build with ocean sim?
+if env['WITH_BF_OCEANSIM'] == 1:
+    env['WITH_BF_FFTW3']  = 1  # ocean needs fftw3 so enable it 
+    env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM')
 
+
 if btools.ENDIAN == "big":
     env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
 else:

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -109,6 +109,9 @@
 BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -86,6 +86,11 @@
 # Motion Tracking
 WITH_BF_LIBMV = False
 
+# Ocean Simulation
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+WITH_BF_OCEANSIM = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -86,6 +86,11 @@
 # Motion Tracking
 WITH_BF_LIBMV = False
 
+# Ocean Simulation
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+WITH_BF_OCEANSIM = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -109,6 +109,9 @@
 BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++

Modified: branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake	2011-11-15 02:58:06 UTC (rev 41849)
@@ -34,6 +34,7 @@
 set(WITH_MOD_DECIMATE        OFF CACHE FORCE BOOL)
 set(WITH_MOD_FLUID           OFF CACHE FORCE BOOL)
 set(WITH_MOD_SMOKE           OFF CACHE FORCE BOOL)
+set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
 set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
 set(WITH_OPENAL              OFF CACHE FORCE BOOL)
 set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)

Modified: branches/bmesh/blender/build_files/scons/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/darwin-config.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/scons/config/darwin-config.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -217,6 +217,7 @@
 
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/freebsd7-config.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/scons/config/freebsd7-config.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -84,6 +84,7 @@
 
 WITH_BF_GAMEENGINE = False
 WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/freebsd8-config.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/scons/config/freebsd8-config.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -84,6 +84,7 @@
 
 WITH_BF_GAMEENGINE = False
 WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/freebsd9-config.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/scons/config/freebsd9-config.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -84,6 +84,7 @@
 
 WITH_BF_GAMEENGINE = False
 WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/bmesh/blender/build_files/scons/config/linux-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linux-config.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/scons/config/linux-config.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -94,6 +94,7 @@
 
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linuxcross-config.py	2011-11-15 02:58:01 UTC (rev 41848)
+++ branches/bmesh/blender/build_files/scons/config/linuxcross-config.py	2011-11-15 02:58:06 UTC (rev 41849)
@@ -90,6 +90,7 @@
 
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = False
+WITH_BF_OCEANSIM = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'


@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list