Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2018-12-08 18:15:22 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2018-12-08 18:16:20 +0300
commit7ec6d84fccdd20f1410f09d7284ccc2ebf80cc3a (patch)
treeb4ecd606488f1ecbbfdb4003a60fabe4f29c2502 /space_view3d_pie_menus
parentb3fdd9054629bff8b88c7137a1d7b50d0fb9551f (diff)
Fix T58952: view3d_pie_menus: using snapping pie causes error
note that logic is not taking into account that snapping to different elements (mixing) is now possible, so it is still setting a single choice as in 2.79. Supporting this is of course possible but would need some more work on the UI to show which elements are currently selected.
Diffstat (limited to 'space_view3d_pie_menus')
-rw-r--r--space_view3d_pie_menus/pie_snap_menu.py31
1 files changed, 15 insertions, 16 deletions
diff --git a/space_view3d_pie_menus/pie_snap_menu.py b/space_view3d_pie_menus/pie_snap_menu.py
index 9bcfd4ad..c1ee22e7 100644
--- a/space_view3d_pie_menus/pie_snap_menu.py
+++ b/space_view3d_pie_menus/pie_snap_menu.py
@@ -89,10 +89,9 @@ class SnapVolume(Operator):
ts = context.tool_settings
if ts.use_snap is False:
ts.use_snap = True
- ts.snap_element = 'VOLUME'
-
- if ts.snap_element != 'VOLUME':
- ts.snap_element = 'VOLUME'
+ ts.snap_elements = {'VOLUME'}
+ if ts.snap_elements != {'VOLUME'}:
+ ts.snap_elements = {'VOLUME'}
return {'FINISHED'}
@@ -106,10 +105,10 @@ class SnapFace(Operator):
if ts.use_snap is False:
ts.use_snap = True
- ts.snap_element = 'FACE'
+ ts.snap_elements = {'FACE'}
- if ts.snap_element != 'FACE':
- ts.snap_element = 'FACE'
+ if ts.snap_elements != {'FACE'}:
+ ts.snap_elements = {'FACE'}
return {'FINISHED'}
@@ -123,10 +122,10 @@ class SnapEdge(Operator):
if ts.use_snap is False:
ts.use_snap = True
- ts.snap_element = 'EDGE'
+ ts.snap_elements = {'EDGE'}
- if ts.snap_element != 'EDGE':
- ts.snap_element = 'EDGE'
+ if ts.snap_elements != {'EDGE'}:
+ ts.snap_elements = {'EDGE'}
return {'FINISHED'}
@@ -140,10 +139,10 @@ class SnapVertex(Operator):
if ts.use_snap is False:
ts.use_snap = True
- ts.snap_element = 'VERTEX'
+ ts.snap_elements = {'VERTEX'}
- if ts.snap_element != 'VERTEX':
- ts.snap_element = 'VERTEX'
+ if ts.snap_elements != {'VERTEX'}:
+ ts.snap_elements = {'VERTEX'}
return {'FINISHED'}
@@ -157,10 +156,10 @@ class SnapIncrement(Operator):
if ts.use_snap is False:
ts.use_snap = True
- ts.snap_element = 'INCREMENT'
+ ts.snap_elements = {'INCREMENT'}
- if ts.snap_element != 'INCREMENT':
- ts.snap_element = 'INCREMENT'
+ if ts.snap_elements != {'INCREMENT'}:
+ ts.snap_elements = {'INCREMENT'}
return {'FINISHED'}