Skip to content
Snippets Groups Projects
Commit 54e52f64 authored by Ryan Inch's avatar Ryan Inch
Browse files

Collection Manager: Fix T80535. Task: T69577

parent cdb0cd2d
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ bl_info = { ...@@ -22,7 +22,7 @@ bl_info = {
"name": "Collection Manager", "name": "Collection Manager",
"description": "Manage collections and their objects", "description": "Manage collections and their objects",
"author": "Ryan Inch", "author": "Ryan Inch",
"version": (2, 14, 1), "version": (2, 14, 2),
"blender": (2, 80, 0), "blender": (2, 80, 0),
"location": "View3D - Object Mode (Shortcut - M)", "location": "View3D - Object Mode (Shortcut - M)",
"warning": '', # used for warning icon and text in addons panel "warning": '', # used for warning icon and text in addons panel
...@@ -163,9 +163,10 @@ def register(): ...@@ -163,9 +163,10 @@ def register():
# create the global menu hotkey # create the global menu hotkey
wm = bpy.context.window_manager wm = bpy.context.window_manager
km = wm.keyconfigs.addon.keymaps.new(name='Object Mode') if wm.keyconfigs.addon: # not present when started with --background
kmi = km.keymap_items.new('view3d.collection_manager', 'M', 'PRESS') km = wm.keyconfigs.addon.keymaps.new(name='Object Mode')
addon_keymaps.append((km, kmi)) kmi = km.keymap_items.new('view3d.collection_manager', 'M', 'PRESS')
addon_keymaps.append((km, kmi))
# Add Collection Manager & QCD Move Widget to the Object->Collections menu # Add Collection Manager & QCD Move Widget to the Object->Collections menu
bpy.types.VIEW3D_MT_object_collection.prepend(menu_addition) bpy.types.VIEW3D_MT_object_collection.prepend(menu_addition)
......
...@@ -53,9 +53,10 @@ def register_qcd(): ...@@ -53,9 +53,10 @@ def register_qcd():
ui.preview_collections["icons"] = pcoll ui.preview_collections["icons"] = pcoll
wm = bpy.context.window_manager wm = bpy.context.window_manager
km = wm.keyconfigs.addon.keymaps.new(name='Object Mode') if wm.keyconfigs.addon: # not present when started with --background
kmi = km.keymap_items.new('view3d.qcd_move_widget', 'V', 'PRESS') km = wm.keyconfigs.addon.keymaps.new(name='Object Mode')
addon_qcd_keymaps.append((km, kmi)) kmi = km.keymap_items.new('view3d.qcd_move_widget', 'V', 'PRESS')
addon_qcd_keymaps.append((km, kmi))
bpy.app.handlers.save_pre.append(save_internal_data) bpy.app.handlers.save_pre.append(save_internal_data)
bpy.app.handlers.load_post.append(load_internal_data) bpy.app.handlers.load_post.append(load_internal_data)
...@@ -74,90 +75,92 @@ def register_qcd(): ...@@ -74,90 +75,92 @@ def register_qcd():
def register_qcd_view_hotkeys(): def register_qcd_view_hotkeys():
wm = bpy.context.window_manager wm = bpy.context.window_manager
# create qcd hotkeys if wm.keyconfigs.addon: # not present when started with --background
qcd_hotkeys = [ # create qcd hotkeys
["ONE", False, "1"], qcd_hotkeys = [
["TWO", False, "2"], ["ONE", False, "1"],
["THREE", False, "3"], ["TWO", False, "2"],
["FOUR", False, "4"], ["THREE", False, "3"],
["FIVE", False, "5"], ["FOUR", False, "4"],
["SIX", False, "6"], ["FIVE", False, "5"],
["SEVEN", False, "7"], ["SIX", False, "6"],
["EIGHT", False, "8"], ["SEVEN", False, "7"],
["NINE", False, "9"], ["EIGHT", False, "8"],
["ZERO", False, "10"], ["NINE", False, "9"],
["ONE", True, "11"], ["ZERO", False, "10"],
["TWO", True, "12"], ["ONE", True, "11"],
["THREE", True, "13"], ["TWO", True, "12"],
["FOUR", True, "14"], ["THREE", True, "13"],
["FIVE", True, "15"], ["FOUR", True, "14"],
["SIX", True, "16"], ["FIVE", True, "15"],
["SEVEN", True, "17"], ["SIX", True, "16"],
["EIGHT", True, "18"], ["SEVEN", True, "17"],
["NINE", True, "19"], ["EIGHT", True, "18"],
["ZERO", True, "20"], ["NINE", True, "19"],
] ["ZERO", True, "20"],
]
for key in qcd_hotkeys:
for mode in ['Object Mode', 'Pose', 'Weight Paint']: for key in qcd_hotkeys:
km = wm.keyconfigs.addon.keymaps.new(name=mode) for mode in ['Object Mode', 'Pose', 'Weight Paint']:
kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS', alt=key[1]) km = wm.keyconfigs.addon.keymaps.new(name=mode)
kmi.properties.slot = key[2] kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS', alt=key[1])
kmi.properties.toggle = False kmi.properties.slot = key[2]
addon_qcd_view_hotkey_keymaps.append((km, kmi)) kmi.properties.toggle = False
addon_qcd_view_hotkey_keymaps.append((km, kmi))
km = wm.keyconfigs.addon.keymaps.new(name=mode)
kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS',shift=True, alt=key[1]) km = wm.keyconfigs.addon.keymaps.new(name=mode)
kmi.properties.slot = key[2] kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS',shift=True, alt=key[1])
kmi.properties.toggle = True kmi.properties.slot = key[2]
addon_qcd_view_hotkey_keymaps.append((km, kmi)) kmi.properties.toggle = True
addon_qcd_view_hotkey_keymaps.append((km, kmi))
def register_qcd_view_edit_mode_hotkeys(): def register_qcd_view_edit_mode_hotkeys():
wm = bpy.context.window_manager wm = bpy.context.window_manager
# create qcd hotkeys if wm.keyconfigs.addon: # not present when started with --background
qcd_hotkeys = [ # create qcd hotkeys
["ONE", False, "1"], qcd_hotkeys = [
["TWO", False, "2"], ["ONE", False, "1"],
["THREE", False, "3"], ["TWO", False, "2"],
["FOUR", False, "4"], ["THREE", False, "3"],
["FIVE", False, "5"], ["FOUR", False, "4"],
["SIX", False, "6"], ["FIVE", False, "5"],
["SEVEN", False, "7"], ["SIX", False, "6"],
["EIGHT", False, "8"], ["SEVEN", False, "7"],
["NINE", False, "9"], ["EIGHT", False, "8"],
["ZERO", False, "10"], ["NINE", False, "9"],
["ONE", True, "11"], ["ZERO", False, "10"],
["TWO", True, "12"], ["ONE", True, "11"],
["THREE", True, "13"], ["TWO", True, "12"],
["FOUR", True, "14"], ["THREE", True, "13"],
["FIVE", True, "15"], ["FOUR", True, "14"],
["SIX", True, "16"], ["FIVE", True, "15"],
["SEVEN", True, "17"], ["SIX", True, "16"],
["EIGHT", True, "18"], ["SEVEN", True, "17"],
["NINE", True, "19"], ["EIGHT", True, "18"],
["ZERO", True, "20"], ["NINE", True, "19"],
] ["ZERO", True, "20"],
]
for mode in ["Mesh", "Curve", "Armature", "Metaball", "Lattice", "Grease Pencil Stroke Edit Mode"]:
for key in qcd_hotkeys: for mode in ["Mesh", "Curve", "Armature", "Metaball", "Lattice", "Grease Pencil Stroke Edit Mode"]:
km = wm.keyconfigs.addon.keymaps.new(name=mode) for key in qcd_hotkeys:
kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS', alt=key[1]) km = wm.keyconfigs.addon.keymaps.new(name=mode)
kmi.properties.slot = key[2] kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS', alt=key[1])
kmi.properties.toggle = False kmi.properties.slot = key[2]
addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) kmi.properties.toggle = False
addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi))
km = wm.keyconfigs.addon.keymaps.new(name=mode)
kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS',shift=True, alt=key[1]) km = wm.keyconfigs.addon.keymaps.new(name=mode)
kmi.properties.slot = key[2] kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS',shift=True, alt=key[1])
kmi.properties.toggle = True kmi.properties.slot = key[2]
addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) kmi.properties.toggle = True
addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi))
km = wm.keyconfigs.addon.keymaps.new(name="Mesh")
kmi = km.keymap_items.new('wm.call_menu', 'ACCENT_GRAVE', 'PRESS') km = wm.keyconfigs.addon.keymaps.new(name="Mesh")
kmi.properties.name = "VIEW3D_MT_edit_mesh_select_mode" kmi = km.keymap_items.new('wm.call_menu', 'ACCENT_GRAVE', 'PRESS')
addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) kmi.properties.name = "VIEW3D_MT_edit_mesh_select_mode"
addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment