[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41421] branches/bmesh/blender: svn merge -r41371:41420 ^/trunk/blender
Campbell Barton
ideasman42 at gmail.com
Tue Nov 1 03:01:11 CET 2011
Revision: 41421
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41421
Author: campbellbarton
Date: 2011-11-01 02:01:09 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
svn merge -r41371:41420 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41371
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/cmake/macros.cmake
branches/bmesh/blender/build_files/scons/config/darwin-config.py
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenlib/BLI_path_util.h
branches/bmesh/blender/source/blender/blenlib/BLI_threads.h
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenlib/intern/threads.c
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/mesh/editface.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/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_tree.c
branches/bmesh/blender/source/blender/nodes/texture/node_texture_tree.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/bmesh/blender/source/blender/python/BPY_extern.h
branches/bmesh/blender/source/blender/python/generic/IDProp.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.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-41371
+ /trunk/blender:39992-41420
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/CMakeLists.txt 2011-11-01 02:01:09 UTC (rev 41421)
@@ -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,11 @@
# # 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)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/bmesh/blender/build_files/cmake/macros.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/macros.cmake 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/build_files/cmake/macros.cmake 2011-11-01 02:01:09 UTC (rev 41421)
@@ -413,8 +413,7 @@
remove_cc_flag("-Werror")
# negate flags implied by '-Wall'
- add_cc_flag("-Wno-unused-parameter")
- add_cc_flag("-Wno-unused-but-set-variable")
+ add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
endif()
if(MSVC)
@@ -434,7 +433,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/bmesh/blender/build_files/scons/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/darwin-config.py 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/build_files/scons/config/darwin-config.py 2011-11-01 02:01:09 UTC (rev 41421)
@@ -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/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-11-01 02:01:09 UTC (rev 41421)
@@ -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;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41371
+ /trunk/blender/release:31524-41420
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py 2011-11-01 02:01:09 UTC (rev 41421)
@@ -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/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-11-01 02:01:09 UTC (rev 41421)
@@ -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)
+ col.label(text="Sample Bias:")
+ col.prop(brush, "texture_sample_bias", slider=True, text="")
- col = split.column()
+ col = layout.column(align=True)
+ col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
+ col.label(text="Overlay:")
- col.prop(tex_slot, "scale")
-
- col = layout.column()
-
- row = col.row(align=True)
- row.label(text="Sample Bias:")
- row = col.row(align=True)
- row.prop(brush, "texture_sample_bias", slider=True, text="")
-
- row = col.row(align=True)
- row.label(text="Overlay:")
- row.active = tex_slot.map_mode in {'FIXED', 'TILED'}
-
- row = col.row(align=True)
-
- col = row.column()
-
+ row = col.row()
if brush.use_texture_overlay:
- col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
+ row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
else:
- col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
+ row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
+ sub = row.row()
+ sub.active = tex_slot.map_mode in {'FIXED', 'TILED'} and brush.use_texture_overlay
+ sub.prop(brush, "texture_overlay_alpha", text="Alpha")
- col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
- col = row.column()
- col.prop(brush, "texture_overlay_alpha", text="Alpha")
- col.active = tex_slot.map_mode in {'FIXED', 'TILED'} and brush.use_texture_overlay
-
-
class VIEW3D_PT_tools_brush_tool(PaintPanel, Panel):
bl_label = "Tool"
bl_options = {'DEFAULT_CLOSED'}
@@ -985,18 +966,14 @@
sculpt = context.tool_settings.sculpt
- split = layout.split()
-
- col = split.column()
+ col = layout.column(align=True)
col.label(text="Mirror:")
- col.prop(sculpt, "use_symmetry_x", text="X")
- col.prop(sculpt, "use_symmetry_y", text="Y")
- col.prop(sculpt, "use_symmetry_z", text="Z")
+ row = col.row()
+ row.prop(sculpt, "use_symmetry_x", text="X", toggle=True)
+ row.prop(sculpt, "use_symmetry_y", text="Y", toggle=True)
+ row.prop(sculpt, "use_symmetry_z", text="Z", toggle=True)
- split.prop(sculpt, "radial_symmetry", text="Radial")
-
- layout.separator()
-
+ layout.column().prop(sculpt, "radial_symmetry", text="Radial")
layout.prop(sculpt, "use_symmetry_feather", text="Feather")
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/deform.c 2011-11-01 00:34:09 UTC (rev 41420)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/deform.c 2011-11-01 02:01:09 UTC (rev 41421)
@@ -107,8 +107,8 @@
MDeformWeight *dw;
for(i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++) {
MDeformWeight *dw_r;
- if(use_verify) dw_r= defvert_find_index(dvert_r, dw->def_nr);
- else dw_r= defvert_verify_index(dvert_r, dw->def_nr);
+ if(use_verify) dw_r= defvert_verify_index(dvert_r, dw->def_nr);
+ else dw_r= defvert_find_index(dvert_r, dw->def_nr);
if(dw_r) {
dw_r->weight= dw->weight;
@@ -126,8 +126,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list