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

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Carlisle <carlisle.b3d@gmail.com>2016-11-15 17:55:54 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-11-15 18:07:32 +0300
commitcb117f283bda615eb63b6767c77a361cea2b8992 (patch)
treec6c7c38c1d65337758ed3dabc1c6d4e098d8e07b
parenta828818d59f0f8ea41900a12db703ba3fae075a7 (diff)
Fix menu inconsistencies
This commit fixes two issues: - UV/Image editor uvs menu did not match the 3D View's which was changed in rB2b240b043078 - Circle select tool was missing in particle edit mode Reviewers: Severin Differential Revision: https://developer.blender.org/D2329
-rw-r--r--release/scripts/startup/bl_ui/space_image.py17
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py1
2 files changed, 16 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index b6087184518..04b4cef9512 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -259,6 +259,20 @@ class IMAGE_MT_uvs_showhide(Menu):
layout.operator("uv.hide", text="Hide Unselected").unselected = True
+class IMAGE_MT_uvs_proportional(Menu):
+ bl_label = "Proportional Editing"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.props_enum(context.tool_settings, "proportional_edit")
+
+ layout.separator()
+
+ layout.label("Falloff:")
+ layout.props_enum(context.tool_settings, "proportional_edit_falloff")
+
+
class IMAGE_MT_uvs_transform(Menu):
bl_label = "Transform"
@@ -360,8 +374,7 @@ class IMAGE_MT_uvs(Menu):
layout.separator()
- layout.prop_menu_enum(toolsettings, "proportional_edit")
- layout.prop_menu_enum(toolsettings, "proportional_edit_falloff")
+ layout.menu("IMAGE_MT_uvs_proportional")
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index bb5eb05c4e9..9de9376312c 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -710,6 +710,7 @@ class VIEW3D_MT_select_particle(Menu):
layout = self.layout
layout.operator("view3d.select_border")
+ layout.operator("view3d.select_circle")
layout.separator()