[Bf-blender-cvs] [619b9e9d819] master: Cleanup: typo, tweak proportional edit check
Campbell Barton
noreply at git.blender.org
Tue May 7 02:12:35 CEST 2019
Commit: 619b9e9d819620611edda87b4870f97c38adc386
Author: Campbell Barton
Date: Tue May 7 10:01:25 2019 +1000
Branches: master
https://developer.blender.org/rB619b9e9d819620611edda87b4870f97c38adc386
Cleanup: typo, tweak proportional edit check
===================================================================
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 1d6aac38b8e..5e63342b57d 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1001,7 +1001,7 @@ class WM_OT_doc_view_manual(Operator):
class WM_OT_doc_view(Operator):
- """Open online reference docs in.a web browser"""
+ """Open online reference docs in a web browser"""
bl_idname = "wm.doc_view"
bl_label = "View Documentation"
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index e08c4e510ef..da18d60786f 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -474,14 +474,15 @@ class VIEW3D_HT_header(Header):
else:
attr = "use_proportional_edit"
- if tool_settings.use_proportional_edit == False:
- kw["icon"] = 'PROP_OFF'
- else:
- kw["icon"] = 'PROP_ON'
+ if tool_settings.use_proportional_edit:
if tool_settings.use_proportional_connected:
kw["icon"] = 'PROP_CON'
elif tool_settings.use_proportional_projected:
kw["icon"] = 'PROP_PROJECTED'
+ else:
+ kw["icon"] = 'PROP_ON'
+ else:
+ kw["icon"] = 'PROP_OFF'
row.prop(tool_settings, attr, icon_only=True, **kw)
sub = row.row(align=True)
More information about the Bf-blender-cvs
mailing list