ae98a033c8
In the industry standard keymap, both deleting objects and collections were mapped to the same keys causing confusion when only collections could be deleted through the keymap. This adds a new delete operator to delete all selected objects and collections, accessible from both the keymap and context menu. Now any selected objects and collections are deleted when Delete is chosen from the keymap. This also updates the tooltip description which was previously undocumented. Resolves T67462
441 lines
15 KiB
Python
441 lines
15 KiB
Python
# ##### BEGIN GPL LICENSE BLOCK #####
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
#
|
|
# ##### END GPL LICENSE BLOCK #####
|
|
|
|
# <pep8 compliant>
|
|
import bpy
|
|
from bpy.types import Header, Menu, Panel
|
|
from bpy.app.translations import (
|
|
contexts as i18n_contexts,
|
|
pgettext_iface as iface_,
|
|
)
|
|
|
|
|
|
class OUTLINER_HT_header(Header):
|
|
bl_space_type = 'OUTLINER'
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
space = context.space_data
|
|
display_mode = space.display_mode
|
|
scene = context.scene
|
|
ks = context.scene.keying_sets.active
|
|
|
|
layout.template_header()
|
|
|
|
layout.prop(space, "display_mode", icon_only=True)
|
|
|
|
if display_mode == 'DATA_API':
|
|
OUTLINER_MT_editor_menus.draw_collapsible(context, layout)
|
|
|
|
layout.separator_spacer()
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(space, "filter_text", icon='VIEWZOOM', text="")
|
|
|
|
layout.separator_spacer()
|
|
|
|
if display_mode == 'SEQUENCE':
|
|
row = layout.row(align=True)
|
|
row.prop(space, "use_sync_select", icon='UV_SYNC_SELECT', text="")
|
|
|
|
row = layout.row(align=True)
|
|
if display_mode in {'SCENES', 'VIEW_LAYER'}:
|
|
row.popover(
|
|
panel="OUTLINER_PT_filter",
|
|
text="",
|
|
icon='FILTER',
|
|
)
|
|
elif display_mode in {'LIBRARIES', 'ORPHAN_DATA'}:
|
|
row.prop(space, "use_filter_id_type", text="", icon='FILTER')
|
|
sub = row.row(align=True)
|
|
sub.active = space.use_filter_id_type
|
|
sub.prop(space, "filter_id_type", text="", icon_only=True)
|
|
|
|
if display_mode == 'VIEW_LAYER':
|
|
layout.operator("outliner.collection_new", text="", icon='COLLECTION_NEW').nested = True
|
|
|
|
elif display_mode == 'ORPHAN_DATA':
|
|
layout.operator("outliner.orphans_purge", text="Purge")
|
|
|
|
elif space.display_mode == 'DATA_API':
|
|
layout.separator()
|
|
|
|
row = layout.row(align=True)
|
|
row.operator("outliner.keyingset_add_selected", icon='ADD', text="")
|
|
row.operator("outliner.keyingset_remove_selected", icon='REMOVE', text="")
|
|
|
|
if ks:
|
|
row = layout.row()
|
|
row.prop_search(scene.keying_sets, "active", scene, "keying_sets", text="")
|
|
|
|
row = layout.row(align=True)
|
|
row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
|
|
row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
|
|
else:
|
|
row = layout.row()
|
|
row.label(text="No Keying Set Active")
|
|
|
|
|
|
class OUTLINER_MT_editor_menus(Menu):
|
|
bl_idname = "OUTLINER_MT_editor_menus"
|
|
bl_label = ""
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
space = context.space_data
|
|
|
|
if space.display_mode == 'DATA_API':
|
|
layout.menu("OUTLINER_MT_edit_datablocks")
|
|
|
|
|
|
class OUTLINER_MT_context_menu(Menu):
|
|
bl_label = "Outliner Context Menu"
|
|
|
|
def draw(self, context):
|
|
space = context.space_data
|
|
|
|
layout = self.layout
|
|
|
|
if space.display_mode == 'VIEW_LAYER':
|
|
OUTLINER_MT_collection_new.draw_without_context_menu(context, layout)
|
|
layout.separator()
|
|
|
|
layout.menu("OUTLINER_MT_context_menu_view")
|
|
|
|
layout.separator()
|
|
|
|
layout.menu("INFO_MT_area")
|
|
|
|
|
|
class OUTLINER_MT_context_menu_view(Menu):
|
|
bl_label = "View"
|
|
|
|
def draw(self, _context):
|
|
layout = self.layout
|
|
|
|
layout.operator("outliner.show_active")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.show_hierarchy")
|
|
layout.operator("outliner.show_one_level", text="Show One Level")
|
|
layout.operator("outliner.show_one_level", text="Hide One Level").open = False
|
|
|
|
|
|
class OUTLINER_MT_edit_datablocks(Menu):
|
|
bl_label = "Edit"
|
|
|
|
def draw(self, _context):
|
|
layout = self.layout
|
|
|
|
layout.operator("outliner.keyingset_add_selected")
|
|
layout.operator("outliner.keyingset_remove_selected")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.drivers_add_selected")
|
|
layout.operator("outliner.drivers_delete_selected")
|
|
|
|
|
|
class OUTLINER_MT_collection_view_layer(Menu):
|
|
bl_label = "View Layer"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.operator("outliner.collection_exclude_set")
|
|
layout.operator("outliner.collection_exclude_clear")
|
|
|
|
if context.engine == 'CYCLES':
|
|
layout.operator("outliner.collection_indirect_only_set")
|
|
layout.operator("outliner.collection_indirect_only_clear")
|
|
|
|
layout.operator("outliner.collection_holdout_set")
|
|
layout.operator("outliner.collection_holdout_clear")
|
|
|
|
|
|
class OUTLINER_MT_collection_visibility(Menu):
|
|
bl_label = "Visibility"
|
|
|
|
def draw(self, _context):
|
|
layout = self.layout
|
|
|
|
layout.operator("outliner.collection_isolate", text="Isolate")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.collection_show", text="Show", icon='HIDE_OFF')
|
|
layout.operator("outliner.collection_show_inside", text="Show All Inside")
|
|
layout.operator("outliner.collection_hide", text="Hide", icon='HIDE_ON')
|
|
layout.operator("outliner.collection_hide_inside", text="Hide All Inside")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.collection_enable", text="Enable in Viewports", icon='RESTRICT_VIEW_OFF')
|
|
layout.operator("outliner.collection_disable", text="Disable in Viewports")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.collection_enable_render", text="Enable in Render", icon='RESTRICT_RENDER_OFF')
|
|
layout.operator("outliner.collection_disable_render", text="Disable in Render")
|
|
|
|
|
|
class OUTLINER_MT_collection(Menu):
|
|
bl_label = "Collection"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
space = context.space_data
|
|
|
|
layout.operator("outliner.collection_new", text="New").nested = True
|
|
layout.operator("outliner.collection_duplicate", text="Duplicate Collection")
|
|
layout.operator("outliner.collection_duplicate_linked", text="Duplicate Linked")
|
|
layout.operator("outliner.id_copy", text="Copy", icon='COPYDOWN')
|
|
layout.operator("outliner.id_paste", text="Paste", icon='PASTEDOWN')
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.delete", text="Delete", icon='X')
|
|
layout.operator("outliner.collection_hierarchy_delete")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.collection_objects_select", text="Select Objects", icon='RESTRICT_SELECT_OFF')
|
|
layout.operator("outliner.collection_objects_deselect", text="Deselect Objects")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.collection_instance", text="Instance to Scene")
|
|
|
|
if space.display_mode != 'VIEW_LAYER':
|
|
layout.operator("outliner.collection_link", text="Link to Scene")
|
|
layout.operator("outliner.id_operation", text="Unlink").type = 'UNLINK'
|
|
|
|
layout.separator()
|
|
|
|
layout.menu("OUTLINER_MT_collection_visibility")
|
|
|
|
if space.display_mode == 'VIEW_LAYER':
|
|
layout.separator()
|
|
layout.menu("OUTLINER_MT_collection_view_layer", icon='RENDERLAYERS')
|
|
|
|
layout.separator()
|
|
|
|
layout.operator_menu_enum("outliner.id_operation", "type", text="ID Data")
|
|
|
|
layout.separator()
|
|
|
|
OUTLINER_MT_context_menu.draw(self, context)
|
|
|
|
|
|
class OUTLINER_MT_collection_new(Menu):
|
|
bl_label = "Collection"
|
|
|
|
@staticmethod
|
|
def draw_without_context_menu(context, layout):
|
|
layout.operator("outliner.collection_new", text="New Collection").nested = False
|
|
layout.operator("outliner.id_paste", text="Paste Data-Blocks", icon='PASTEDOWN')
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
self.draw_without_context_menu(context, layout)
|
|
|
|
layout.separator()
|
|
|
|
OUTLINER_MT_context_menu.draw(self, context)
|
|
|
|
|
|
class OUTLINER_MT_object(Menu):
|
|
bl_label = "Object"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
space = context.space_data
|
|
obj = context.active_object
|
|
object_mode = 'OBJECT' if obj is None else obj.mode
|
|
|
|
layout.operator("outliner.id_copy", text="Copy", icon='COPYDOWN')
|
|
layout.operator("outliner.id_paste", text="Paste", icon='PASTEDOWN')
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.delete", text="Delete", icon='X')
|
|
|
|
if space.display_mode == 'VIEW_LAYER' and not space.use_filter_collection:
|
|
layout.operator("outliner.object_operation", text="Delete Hierarchy").type = 'DELETE_HIERARCHY'
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("outliner.object_operation", text="Select", icon='RESTRICT_SELECT_OFF').type = 'SELECT'
|
|
layout.operator("outliner.object_operation", text="Select Hierarchy").type = 'SELECT_HIERARCHY'
|
|
layout.operator("outliner.object_operation", text="Deselect").type = 'DESELECT'
|
|
|
|
layout.separator()
|
|
|
|
if object_mode in {'EDIT', 'POSE'}:
|
|
name = bpy.types.Object.bl_rna.properties["mode"].enum_items[object_mode].name
|
|
layout.operator("outliner.object_operation",
|
|
text=iface_("%s Set", i18n_contexts.operator_default) % name).type = 'OBJECT_MODE_ENTER'
|
|
layout.operator("outliner.object_operation",
|
|
text=iface_("%s Clear", i18n_contexts.operator_default) % name).type = 'OBJECT_MODE_EXIT'
|
|
del name
|
|
|
|
layout.separator()
|
|
|
|
if not (space.display_mode == 'VIEW_LAYER' and not space.use_filter_collection):
|
|
layout.operator("outliner.id_operation", text="Unlink").type = 'UNLINK'
|
|
layout.separator()
|
|
|
|
layout.operator_menu_enum("outliner.id_operation", "type", text="ID Data")
|
|
|
|
layout.separator()
|
|
|
|
OUTLINER_MT_context_menu.draw(self, context)
|
|
|
|
|
|
class OUTLINER_PT_filter(Panel):
|
|
bl_space_type = 'OUTLINER'
|
|
bl_region_type = 'HEADER'
|
|
bl_label = "Filter"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
space = context.space_data
|
|
display_mode = space.display_mode
|
|
|
|
if display_mode == 'VIEW_LAYER':
|
|
layout.label(text="Restriction Toggles:")
|
|
row = layout.row(align=True)
|
|
row.prop(space, "show_restrict_column_enable", text="")
|
|
row.prop(space, "show_restrict_column_select", text="")
|
|
row.prop(space, "show_restrict_column_hide", text="")
|
|
row.prop(space, "show_restrict_column_viewport", text="")
|
|
row.prop(space, "show_restrict_column_render", text="")
|
|
row.prop(space, "show_restrict_column_holdout", text="")
|
|
row.prop(space, "show_restrict_column_indirect_only", text="")
|
|
layout.separator()
|
|
elif display_mode == 'SCENES':
|
|
layout.label(text="Restriction Toggles:")
|
|
row = layout.row(align=True)
|
|
row.prop(space, "show_restrict_column_select", text="")
|
|
row.prop(space, "show_restrict_column_hide", text="")
|
|
row.prop(space, "show_restrict_column_viewport", text="")
|
|
row.prop(space, "show_restrict_column_render", text="")
|
|
layout.separator()
|
|
|
|
if display_mode != 'DATA_API':
|
|
col = layout.column(align=True)
|
|
col.prop(space, "use_sort_alpha")
|
|
layout.separator()
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(space, "use_sync_select", text="Sync Selection")
|
|
layout.separator()
|
|
|
|
col = layout.column(align=True)
|
|
col.label(text="Search:")
|
|
col.prop(space, "use_filter_complete", text="Exact Match")
|
|
col.prop(space, "use_filter_case_sensitive", text="Case Sensitive")
|
|
|
|
if display_mode != 'VIEW_LAYER':
|
|
return
|
|
|
|
layout.separator()
|
|
|
|
layout.label(text="Filter:")
|
|
|
|
col = layout.column(align=True)
|
|
|
|
row = col.row()
|
|
row.label(icon='GROUP')
|
|
row.prop(space, "use_filter_collection", text="Collections")
|
|
row = col.row()
|
|
row.label(icon='OBJECT_DATAMODE')
|
|
row.prop(space, "use_filter_object", text="Objects")
|
|
row.prop(space, "filter_state", text="")
|
|
|
|
sub = col.column(align=True)
|
|
sub.active = space.use_filter_object
|
|
|
|
row = sub.row()
|
|
row.label(icon='BLANK1')
|
|
row.prop(space, "use_filter_object_content", text="Object Contents")
|
|
row = sub.row()
|
|
row.label(icon='BLANK1')
|
|
row.prop(space, "use_filter_children", text="Object Children")
|
|
|
|
if bpy.data.meshes:
|
|
row = sub.row()
|
|
row.label(icon='MESH_DATA')
|
|
row.prop(space, "use_filter_object_mesh", text="Meshes")
|
|
if bpy.data.armatures:
|
|
row = sub.row()
|
|
row.label(icon='ARMATURE_DATA')
|
|
row.prop(space, "use_filter_object_armature", text="Armatures")
|
|
if bpy.data.lights:
|
|
row = sub.row()
|
|
row.label(icon='LIGHT_DATA')
|
|
row.prop(space, "use_filter_object_light", text="Lights")
|
|
if bpy.data.cameras:
|
|
row = sub.row()
|
|
row.label(icon='CAMERA_DATA')
|
|
row.prop(space, "use_filter_object_camera", text="Cameras")
|
|
row = sub.row()
|
|
row.label(icon='EMPTY_DATA')
|
|
row.prop(space, "use_filter_object_empty", text="Empties")
|
|
|
|
if (
|
|
bpy.data.curves or
|
|
bpy.data.metaballs or
|
|
(hasattr(bpy.data, "hairs") and bpy.data.hairs) or
|
|
(hasattr(bpy.data, "pointclouds") and bpy.data.pointclouds) or
|
|
bpy.data.volumes or
|
|
bpy.data.lightprobes or
|
|
bpy.data.lattices or
|
|
bpy.data.fonts or
|
|
bpy.data.speakers
|
|
):
|
|
row = sub.row()
|
|
row.label(icon='BLANK1')
|
|
row.prop(space, "use_filter_object_others", text="Others")
|
|
|
|
|
|
classes = (
|
|
OUTLINER_HT_header,
|
|
OUTLINER_MT_editor_menus,
|
|
OUTLINER_MT_edit_datablocks,
|
|
OUTLINER_MT_collection,
|
|
OUTLINER_MT_collection_new,
|
|
OUTLINER_MT_collection_visibility,
|
|
OUTLINER_MT_collection_view_layer,
|
|
OUTLINER_MT_object,
|
|
OUTLINER_MT_context_menu,
|
|
OUTLINER_MT_context_menu_view,
|
|
OUTLINER_PT_filter,
|
|
)
|
|
|
|
if __name__ == "__main__": # only for live edit.
|
|
from bpy.utils import register_class
|
|
for cls in classes:
|
|
register_class(cls)
|