support proportional editing with x-mirror enabled.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Jun 2013 18:19:42 +0000 (18:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Jun 2013 18:19:42 +0000 (18:19 +0000)
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c

index cb1d374ce6b00c7c26caa8894e331c87136de922..a892a91d50554152013cb720740117a223a816d0 100644 (file)
@@ -232,7 +232,6 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
         mesh = ob.data
 
         col = layout.column(align=True)
-        col.active = tool_settings.proportional_edit == 'DISABLED'
         col.prop(mesh, "use_mirror_x")
 
         row = col.row()
index 2a982517d3e7e326d15f6b06ef0579409f1e045b..1df5a7e323cbbffb05c6a3dab272a51f259ab8ff 100644 (file)
@@ -2038,7 +2038,7 @@ static void createTransEditVerts(TransInfo *t)
        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;
        }
 
index 3e4316b1277e2aad3390d67d577677b5f591200a..7afced78746ebcc172cf9e125a22fe9033c2150b 100644 (file)
@@ -1314,9 +1314,11 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *even
        }
        
        // 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);