[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57616] trunk/blender: support proportional editing with x-mirror enabled.

[Campbell Barton]

Revision: 57616
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57616
Author:   campbellbarton
Date:     2013-06-20 18:19:42 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
support proportional editing with x-mirror enabled.

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

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-06-20 15:57:30 UTC (rev 57615)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-06-20 18:19:42 UTC (rev 57616)
@@ -232,7 +232,6 @@
         mesh = ob.data
 
         col = layout.column(align=True)
-        col.active = tool_settings.proportional_edit == 'DISABLED'
         col.prop(mesh, "use_mirror_x")
 
         row = col.row()

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-06-20 15:57:30 UTC (rev 57615)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-06-20 18:19:42 UTC (rev 57616)
@@ -2038,7 +2038,7 @@
 	int cd_vert_bweight_offset = -1;
 
 	if (t->flag & T_MIRROR) {
-		EDBM_verts_mirror_cache_begin(em, 0, false, true);
+		EDBM_verts_mirror_cache_begin(em, 0, false, (t->flag & T_PROP_EDIT) == 0);
 		mirror = 1;
 	}
 

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2013-06-20 15:57:30 UTC (rev 57615)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2013-06-20 18:19:42 UTC (rev 57616)
@@ -1314,9 +1314,11 @@
 	}
 	
 	// Mirror is not supported with PET, turn it off.
+#if 0
 	if (t->flag & T_PROP_EDIT) {
 		t->flag &= ~T_MIRROR;
 	}
+#endif
 
 	setTransformViewMatrices(t);
 	initNumInput(&t->num);