Merged changes in the trunk up to revision 52191.
Conflicts resolved: source/blender/makesdna/DNA_scene_types.h
This commit is contained in:
@@ -554,6 +554,12 @@ class WM_MT_operator_presets(Menu):
|
||||
|
||||
def draw(self, context):
|
||||
self.operator = context.active_operator.bl_idname
|
||||
|
||||
# dummy 'default' menu item
|
||||
layout = self.layout
|
||||
layout.operator("wm.operator_defaults")
|
||||
layout.seperator()
|
||||
|
||||
Menu.draw_preset(self, context)
|
||||
|
||||
@property
|
||||
|
||||
@@ -249,6 +249,7 @@ class IMAGE_MT_uvs_weldalign(Menu):
|
||||
layout = self.layout
|
||||
|
||||
layout.operator("uv.weld") # W, 1
|
||||
layout.operator("uv.remove_doubles")
|
||||
layout.operator_enum("uv.align", "axis") # W, 2/3/4
|
||||
|
||||
|
||||
|
||||
@@ -1736,18 +1736,9 @@ class VIEW3D_MT_edit_mesh_select_mode(Menu):
|
||||
layout = self.layout
|
||||
|
||||
layout.operator_context = 'INVOKE_REGION_WIN'
|
||||
|
||||
props = layout.operator("wm.context_set_value", text="Vertex", icon='VERTEXSEL')
|
||||
props.value = "(True, False, False)"
|
||||
props.data_path = "tool_settings.mesh_select_mode"
|
||||
|
||||
props = layout.operator("wm.context_set_value", text="Edge", icon='EDGESEL')
|
||||
props.value = "(False, True, False)"
|
||||
props.data_path = "tool_settings.mesh_select_mode"
|
||||
|
||||
props = layout.operator("wm.context_set_value", text="Face", icon='FACESEL')
|
||||
props.value = "(False, False, True)"
|
||||
props.data_path = "tool_settings.mesh_select_mode"
|
||||
layout.operator("mesh.select_mode", text="Vertex", icon='VERTEXSEL').type = 'VERT'
|
||||
layout.operator("mesh.select_mode", text="Edge", icon='EDGESEL').type = 'EDGE'
|
||||
layout.operator("mesh.select_mode", text="Face", icon='FACESEL').type = 'FACE'
|
||||
|
||||
|
||||
class VIEW3D_MT_edit_mesh_extrude(Menu):
|
||||
|
||||
Reference in New Issue
Block a user