diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-19 08:30:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-19 08:30:20 +0300 |
commit | 27ab054badc5deb1fd1755723f51f562027808ee (patch) | |
tree | 8da47ebb8b96ce788139bb3316da7041f9f0d7bd /release | |
parent | 32145c4a88f9b4947e22e51b9f17459fe6eacd79 (diff) | |
parent | c64e515f9071c38ac23d14fa95f511e6d19066a8 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/mesh.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 57 |
2 files changed, 46 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_operators/mesh.py b/release/scripts/startup/bl_operators/mesh.py index 9151f800497..c7a11c23c3f 100644 --- a/release/scripts/startup/bl_operators/mesh.py +++ b/release/scripts/startup/bl_operators/mesh.py @@ -179,7 +179,7 @@ class MeshSelectNext(Operator): class MeshSelectPrev(Operator): - """Select the next element (using selection order)""" + """Select the previous element (using selection order)""" bl_idname = "mesh.select_prev_item" bl_label = "Select Previous Element" bl_options = {'REGISTER', 'UNDO'} diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 9bdf1c67f2b..f2c5e2ea732 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -20,9 +20,9 @@ import bpy from bpy.types import Header, Menu, Panel from bl_ui.properties_grease_pencil_common import ( - GreasePencilDataPanel, - GreasePencilPaletteColorPanel, - ) + GreasePencilDataPanel, + GreasePencilPaletteColorPanel, +) from bl_ui.properties_paint_common import UnifiedPaintPanel from bpy.app.translations import contexts as i18n_contexts @@ -1281,7 +1281,12 @@ class INFO_MT_add(Menu): layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("object.group_instance_add", text="Group Instance...", icon='OUTLINER_OB_GROUP_INSTANCE') else: - layout.operator_menu_enum("object.group_instance_add", "group", text="Group Instance", icon='OUTLINER_OB_GROUP_INSTANCE') + layout.operator_menu_enum( + "object.group_instance_add", + "group", + text="Group Instance", + icon='OUTLINER_OB_GROUP_INSTANCE', + ) # ********** Object menu ********** @@ -1549,17 +1554,41 @@ class VIEW3D_MT_object_apply(Menu): layout.separator() - layout.operator("object.transforms_to_deltas", text="Location to Deltas", text_ctxt=i18n_contexts.default).mode = 'LOC' - layout.operator("object.transforms_to_deltas", text="Rotation to Deltas", text_ctxt=i18n_contexts.default).mode = 'ROT' - layout.operator("object.transforms_to_deltas", text="Scale to Deltas", text_ctxt=i18n_contexts.default).mode = 'SCALE' - - layout.operator("object.transforms_to_deltas", text="All Transforms to Deltas", text_ctxt=i18n_contexts.default).mode = 'ALL' + layout.operator( + "object.transforms_to_deltas", + text="Location to Deltas", + text_ctxt=i18n_contexts.default, + ).mode = 'LOC' + layout.operator( + "object.transforms_to_deltas", + text="Rotation to Deltas", + text_ctxt=i18n_contexts.default, + ).mode = 'ROT' + layout.operator( + "object.transforms_to_deltas", + text="Scale to Deltas", + text_ctxt=i18n_contexts.default, + ).mode = 'SCALE' + + layout.operator( + "object.transforms_to_deltas", + text="All Transforms to Deltas", + text_ctxt=i18n_contexts.default, + ).mode = 'ALL' layout.operator("object.anim_transforms_to_deltas") layout.separator() - layout.operator("object.visual_transform_apply", text="Visual Transform", text_ctxt=i18n_contexts.default) - layout.operator("object.convert", text="Visual Geometry to Mesh", text_ctxt=i18n_contexts.default).target = 'MESH' + layout.operator( + "object.visual_transform_apply", + text="Visual Transform", + text_ctxt=i18n_contexts.default, + ) + layout.operator( + "object.convert", + text="Visual Geometry to Mesh", + text_ctxt=i18n_contexts.default, + ).target = 'MESH' layout.operator("object.duplicates_make_real") @@ -1823,7 +1852,10 @@ class VIEW3D_MT_vertex_group(Menu): if ob.vertex_groups.active: layout.separator() layout.operator("object.vertex_group_assign", text="Assign to Active Group") - layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").use_all_groups = False + layout.operator( + "object.vertex_group_remove_from", + text="Remove from Active Group", + ).use_all_groups = False layout.operator("object.vertex_group_remove_from", text="Remove from All").use_all_groups = True layout.separator() @@ -3756,6 +3788,7 @@ class VIEW3D_PT_context_properties(Panel): # Draw with no edit button rna_prop_ui.draw(self.layout, context, member, object, False) + classes = ( VIEW3D_HT_header, VIEW3D_MT_editor_menus, |