[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41413] branches/soc-2011-carrot: Merge with trunk r41411
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Mon Oct 31 14:18:14 CET 2011
Revision: 41413
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41413
Author: miikah
Date: 2011-10-31 13:18:14 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Merge with trunk r41411
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41411
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/SConstruct
branches/soc-2011-carrot/build_files/cmake/macros.cmake
branches/soc-2011-carrot/build_files/scons/config/darwin-config.py
branches/soc-2011-carrot/build_files/scons/tools/btools.py
branches/soc-2011-carrot/intern/SConscript
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenkernel/SConscript
branches/soc-2011-carrot/source/blender/blenkernel/intern/deform.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-carrot/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_string.h
branches/soc-2011-carrot/source/blender/blenlib/intern/bpath.c
branches/soc-2011-carrot/source/blender/blenlib/intern/path_util.c
branches/soc-2011-carrot/source/blender/blenlib/intern/string.c
branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/mesh/editface.c
branches/soc-2011-carrot/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-carrot/source/blender/editors/render/render_opengl.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-carrot/source/blender/gpu/GPU_extensions.h
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-carrot/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-carrot/source/blender/modifiers/SConscript
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-carrot/source/blender/python/BPY_extern.h
branches/soc-2011-carrot/source/blender/python/generic/IDProp.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
branches/soc-2011-carrot/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-41342
+ /trunk/blender:36828-41411
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-10-31 13:18:14 UTC (rev 41413)
@@ -65,7 +65,7 @@
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG _DEBUG)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE NDEBUG)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL NDEBUG)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO DEBUG _DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
#-----------------------------------------------------------------------------
@@ -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-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/SConstruct 2011-10-31 13:18:14 UTC (rev 41413)
@@ -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-2011-carrot/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/macros.cmake 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/build_files/cmake/macros.cmake 2011-10-31 13:18:14 UTC (rev 41413)
@@ -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-2011-carrot/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-carrot/build_files/scons/config/darwin-config.py 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/build_files/scons/config/darwin-config.py 2011-10-31 13:18:14 UTC (rev 41413)
@@ -336,7 +336,7 @@
# some flags shuffling for different OS versions
if MAC_MIN_VERS == '10.3':
- CCFLAGS = ['-fuse-cxa-atexit'] + CFLAGS
+ CCFLAGS = ['-fuse-cxa-atexit'] + CCFLAGS
PLATFORM_LINKFLAGS = ['-fuse-cxa-atexit'] + PLATFORM_LINKFLAGS
LLIBS.append('crt3.o')
Modified: branches/soc-2011-carrot/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-carrot/build_files/scons/tools/btools.py 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/build_files/scons/tools/btools.py 2011-10-31 13:18:14 UTC (rev 41413)
@@ -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-2011-carrot/intern/SConscript
===================================================================
--- branches/soc-2011-carrot/intern/SConscript 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/intern/SConscript 2011-10-31 13:18:14 UTC (rev 41413)
@@ -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-2011-carrot/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36828-38663,39001-41342
+ /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36828-38663,39001-41411
Modified: branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-31 13:18:14 UTC (rev 41413)
@@ -578,7 +578,7 @@
if (strstr(rstring,"MacBookAir") ||
(strstr(rstring,"MacBook") && (rstring[strlen(rstring)-3]>='5') && (rstring[strlen(rstring)-3]<='9')))
m_hasMultiTouchTrackpad = true;
- else m_hasMultiTouchTrackpad = true;
+ else m_hasMultiTouchTrackpad = true; // experimental, changes only MagicMouse behaviour (zoom->pan) but enables MagicTrackpad for all Macs
free( rstring );
rstring = NULL;
@@ -1610,7 +1610,7 @@
GHOST_TInt32 x, y;
window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventMagnify, x, y,
- [event magnification]*250.0 + 0.1, 0));
+ [event magnification]*125.0 + 0.1, 0));
}
break;
Modified: branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py 2011-10-31 13:18:14 UTC (rev 41413)
@@ -1371,9 +1371,9 @@
km = context.keymap
if km.is_modal:
- km.keymap_items.new_modal("", 'A', 'PRESS') #~ kmi
+ km.keymap_items.new_modal("", 'A', 'PRESS')
else:
- km.keymap_items.new("none", 'A', 'PRESS') #~ kmi
+ km.keymap_items.new("none", 'A', 'PRESS')
# clear filter and expand keymap so we can see the newly added item
if context.space_data.filter_text != "":
Modified: branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-10-31 13:01:06 UTC (rev 41412)
+++ branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-10-31 13:18:14 UTC (rev 41413)
@@ -711,19 +711,14 @@
if context.sculpt_object:
#XXX duplicated from properties_texture.py
- col.separator()
-
col.label(text="Brush Mapping:")
- row = col.row(align=True)
- row.prop(tex_slot, "map_mode", expand=True)
+ col.row().prop(tex_slot, "map_mode", expand=True)
col.separator()
col = layout.column()
col.active = tex_slot.map_mode in {'FIXED'}
col.label(text="Angle:")
-
- col = layout.column()
if not brush.use_anchor and brush.sculpt_tool not in {'GRAB', 'SNAKE_HOOK', 'THUMB', 'ROTATE'} and tex_slot.map_mode in {'FIXED'}:
col.prop(brush, "texture_angle_source_random", text="")
else:
@@ -740,49 +735,35 @@
#col.prop(brush, "use_rake", toggle=True, icon='PARTICLEMODE', text="")
col = layout.column()
- col.prop(tex_slot, "angle", text="")
col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
+ col.prop(tex_slot, "angle", text="")
#col = layout.column()
#col.prop(brush, "use_random_rotation")
#col.active = (not brush.use_rake) and (not brush.use_anchor) and (brush.sculpt_tool not in {'GRAB', 'SNAKE_HOOK', 'THUMB', 'ROTATE'}) and tex_slot.map_mode in {'FIXED'}
split = layout.split()
+ split.prop(tex_slot, "offset")
+ split.prop(tex_slot, "scale")
- col = split.column()
- col.prop(tex_slot, "offset")
+ col = layout.column(align=True)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list