[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41388] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 41387.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Oct 30 22:38:02 CET 2011
Revision: 41388
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41388
Author: kjym3
Date: 2011-10-30 21:38:01 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 41387.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41387
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-39896,39898-40096,40098-41368
+ /trunk/blender:34011-39896,39898-40096,40098-41387
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-10-30 20:47:03 UTC (rev 41387)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-10-30 21:38:01 UTC (rev 41388)
@@ -302,6 +302,9 @@
set(C_WARNINGS)
set(CXX_WARNINGS)
+# for gcc -Wno-blah-blah
+set(CC_REMOVE_STRICT_FLAGS)
+
# libraries to link the binary with passed to target_link_libraries()
# known as LLIBS to scons
set(PLATFORM_LINKLIBS "")
@@ -1250,6 +1253,9 @@
# # this causes too many warnings, disable
# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+ # flags to undo strict flags
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-10-30 20:47:03 UTC (rev 41387)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-10-30 21:38:01 UTC (rev 41388)
@@ -253,7 +253,9 @@
target_env_defs['WITH_BF_BULLET'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_FLUID'] = False
+ target_env_defs['WITH_BF_DECIMATE'] = False
+ target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
@@ -323,9 +325,9 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
-# disable elbeem (fluidsim) compilation?
-if env['BF_NO_ELBEEM'] == 1:
- env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+# build without elbeem (fluidsim)?
+if env['WITH_BF_FLUID'] == 1:
+ env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
if btools.ENDIAN == "big":
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-10-30 20:47:03 UTC (rev 41387)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-10-30 21:38:01 UTC (rev 41388)
@@ -434,7 +434,7 @@
if(CMAKE_COMPILER_IS_GNUCC)
set_source_files_properties(${_SOURCE}
PROPERTIES
- COMPILE_FLAGS "-Wno-deprecated-declarations"
+ COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"
)
endif()
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-10-30 20:47:03 UTC (rev 41387)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-10-30 21:38:01 UTC (rev 41388)
@@ -150,7 +150,9 @@
'BF_GHOST_DEBUG',
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
- 'BF_NO_ELBEEM',
+ 'WITH_BF_FLUID',
+ 'WITH_BF_DECIMATE',
+ 'WITH_BF_BOOLEAN',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
@@ -250,7 +252,9 @@
(BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
- (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),
+ (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
+ (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
+ (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
('BF_OPENAL', 'base path for OpenAL', ''),
Modified: branches/soc-2008-mxcurioni/intern/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/intern/SConscript 2011-10-30 20:47:03 UTC (rev 41387)
+++ branches/soc-2008-mxcurioni/intern/SConscript 2011-10-30 21:38:01 UTC (rev 41388)
@@ -22,7 +22,7 @@
# perhaps get rid of intern/csg?
NEW_CSG='false'
-if not env['BF_NO_ELBEEM']:
+if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
if NEW_CSG=='false':
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:35829-39896,40098-41368
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:35829-39896,40098-41387
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list