diff options
Diffstat (limited to 'space_view3d_pie_menus')
-rw-r--r-- | space_view3d_pie_menus/pie_align_menu.py | 12 | ||||
-rw-r--r-- | space_view3d_pie_menus/pie_proportional_menu.py | 69 |
2 files changed, 24 insertions, 57 deletions
diff --git a/space_view3d_pie_menus/pie_align_menu.py b/space_view3d_pie_menus/pie_align_menu.py index dbdea815..792d4d12 100644 --- a/space_view3d_pie_menus/pie_align_menu.py +++ b/space_view3d_pie_menus/pie_align_menu.py @@ -127,12 +127,12 @@ class AlignSelectedXYZ(Operator): chosen_value = values[self.axis][0] constraint_value = values[self.axis][1] bpy.ops.transform.resize( - value=chosen_value, constraint_axis=constraint_value, - orient_type='GLOBAL', - mirror=False, proportional='DISABLED', - proportional_edit_falloff='SMOOTH', - proportional_size=1 - ) + value=chosen_value, + constraint_axis=constraint_value, + orient_type='GLOBAL', + mirror=False, + use_proportional_edit=False, + ) return {'FINISHED'} diff --git a/space_view3d_pie_menus/pie_proportional_menu.py b/space_view3d_pie_menus/pie_proportional_menu.py index 5c4c4eba..3a6d053b 100644 --- a/space_view3d_pie_menus/pie_proportional_menu.py +++ b/space_view3d_pie_menus/pie_proportional_menu.py @@ -175,11 +175,7 @@ class ProportionalEditEdt(Operator): def execute(self, context): ts = context.tool_settings - - if ts.proportional_edit != ('DISABLED'): - ts.proportional_edit = 'DISABLED' - elif ts.proportional_edit != ('ENABLED'): - ts.proportional_edit = 'ENABLED' + ts.use_proportional_edit ^= 1 return {'FINISHED'} @@ -190,8 +186,7 @@ class ProportionalConnectedEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit != ('CONNECTED'): - ts.proportional_edit = 'CONNECTED' + ts.use_proportional_connected = True return {'FINISHED'} @@ -203,8 +198,8 @@ class ProportionalProjectedEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit != ('PROJECTED'): - ts.proportional_edit = 'PROJECTED' + ts = context.tool_settings + ts.use_proportional_projected = True return {'FINISHED'} @@ -215,12 +210,8 @@ class ProportionalSmoothEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'SMOOTH' - - if ts.proportional_edit_falloff != 'SMOOTH': - ts.proportional_edit_falloff = 'SMOOTH' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'SMOOTH' return {'FINISHED'} @@ -231,12 +222,8 @@ class ProportionalSphereEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'SPHERE' - - if ts.proportional_edit_falloff != 'SPHERE': - ts.proportional_edit_falloff = 'SPHERE' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'SPHERE' return {'FINISHED'} @@ -247,12 +234,8 @@ class ProportionalRootEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'ROOT' - - if ts.proportional_edit_falloff != 'ROOT': - ts.proportional_edit_falloff = 'ROOT' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'ROOT' return {'FINISHED'} @@ -263,12 +246,8 @@ class ProportionalSharpEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'SHARP' - - if ts.proportional_edit_falloff != 'SHARP': - ts.proportional_edit_falloff = 'SHARP' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'SHARP' return {'FINISHED'} @@ -279,12 +258,8 @@ class ProportionalLinearEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'LINEAR' - - if ts.proportional_edit_falloff != 'LINEAR': - ts.proportional_edit_falloff = 'LINEAR' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'LINEAR' return {'FINISHED'} @@ -295,12 +270,8 @@ class ProportionalConstantEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'CONSTANT' - - if ts.proportional_edit_falloff != 'CONSTANT': - ts.proportional_edit_falloff = 'CONSTANT' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'CONSTANT' return {'FINISHED'} @@ -311,12 +282,8 @@ class ProportionalRandomEdt(Operator): def execute(self, context): ts = context.tool_settings - if ts.proportional_edit == 'DISABLED': - ts.proportional_edit = 'ENABLED' - ts.proportional_edit_falloff = 'RANDOM' - - if ts.proportional_edit_falloff != 'RANDOM': - ts.proportional_edit_falloff = 'RANDOM' + ts.use_proportional_edit = True + ts.proportional_edit_falloff = 'RANDOM' return {'FINISHED'} |