[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41550] trunk/blender: Disable x-mirror option when proportional edit is enabled.

[Sergey Sharybin]

Revision: 41550
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41550
Author:   nazgul
Date:     2011-11-05 10:19:36 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Disable x-mirror option when proportional edit is enabled.

This option isn't supported because it behaves strangely in 50% of cases and
hopefully disabled x-mirror will stop users be confused by this.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-11-05 08:40:07 UTC (rev 41549)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-11-05 10:19:36 UTC (rev 41550)
@@ -179,18 +179,21 @@
         ob = context.active_object
 
         if ob:
+            tool_settings = context.tool_settings
             mesh = ob.data
+
             col = layout.column(align=True)
+            col.active = tool_settings.proportional_edit == 'DISABLED'
             col.prop(mesh, "use_mirror_x")
-            sub = col.column()
-            sub.active = ob.data.use_mirror_x
-            sub.prop(mesh, "use_mirror_topology")
 
-            ts = context.tool_settings
+            row = col.row()
+            row.active = ob.data.use_mirror_x
+            row.prop(mesh, "use_mirror_topology")
 
-            col.label("Edge Select Mode")
-            col.prop(ts, "edge_path_mode", text="")
-            col.prop(context.tool_settings, "edge_path_live_unwrap")
+            col = layout.column(align=True)
+            col.label("Edge Select Mode:")
+            col.prop(tool_settings, "edge_path_mode", text="")
+            col.prop(tool_settings, "edge_path_live_unwrap")
 
 # ********** default tools for editmode_curve ****************
 

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2011-11-05 08:40:07 UTC (rev 41549)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2011-11-05 10:19:36 UTC (rev 41550)
@@ -874,6 +874,7 @@
 				case ND_MODE:
 				case ND_LAYER:
 				case ND_LAYER_CONTENT:
+				case ND_TOOLSETTINGS:
 					ED_region_tag_redraw(ar);
 					break;
 			}