diff options
Diffstat (limited to 'release/scripts/presets')
65 files changed, 86 insertions, 97 deletions
diff --git a/release/scripts/presets/camera/1_inch.py b/release/scripts/presets/camera/1_inch.py index 72b039fb978..97e87b8c5a7 100644 --- a/release/scripts/presets/camera/1_inch.py +++ b/release/scripts/presets/camera/1_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 13.2 bpy.context.camera.sensor_height = 8.80 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/1_slash_1.8_inch.py b/release/scripts/presets/camera/1_slash_1.8_inch.py index 38e09182de6..8b0dc3cea1d 100644 --- a/release/scripts/presets/camera/1_slash_1.8_inch.py +++ b/release/scripts/presets/camera/1_slash_1.8_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 7.18 bpy.context.camera.sensor_height = 5.32 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/1_slash_2.3_inch.py b/release/scripts/presets/camera/1_slash_2.3_inch.py index 4d55738f4ed..bd6808da082 100644 --- a/release/scripts/presets/camera/1_slash_2.3_inch.py +++ b/release/scripts/presets/camera/1_slash_2.3_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 6.17 bpy.context.camera.sensor_height = 4.55 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/1_slash_2.5_inch.py b/release/scripts/presets/camera/1_slash_2.5_inch.py index cbdb6f3cbe0..90f60e7d7f0 100644 --- a/release/scripts/presets/camera/1_slash_2.5_inch.py +++ b/release/scripts/presets/camera/1_slash_2.5_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 5.76 bpy.context.camera.sensor_height = 4.29 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/1_slash_2.7_inch.py b/release/scripts/presets/camera/1_slash_2.7_inch.py index 5ccfa4ab555..4a9591803d0 100644 --- a/release/scripts/presets/camera/1_slash_2.7_inch.py +++ b/release/scripts/presets/camera/1_slash_2.7_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 5.37 bpy.context.camera.sensor_height = 4.04 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/1_slash_3.2_inch.py b/release/scripts/presets/camera/1_slash_3.2_inch.py index 1963f7ec048..5f31b9ec49c 100644 --- a/release/scripts/presets/camera/1_slash_3.2_inch.py +++ b/release/scripts/presets/camera/1_slash_3.2_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 4.54 bpy.context.camera.sensor_height = 3.42 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/2_slash_3_inch.py b/release/scripts/presets/camera/2_slash_3_inch.py index 25b46016800..eb463a31af7 100644 --- a/release/scripts/presets/camera/2_slash_3_inch.py +++ b/release/scripts/presets/camera/2_slash_3_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 8.8 bpy.context.camera.sensor_height = 6.6 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/APS-C.py b/release/scripts/presets/camera/APS-C.py index 84e40825248..4031e8bae71 100644 --- a/release/scripts/presets/camera/APS-C.py +++ b/release/scripts/presets/camera/APS-C.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 23.6 bpy.context.camera.sensor_height = 15.6 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/APS-C_(Canon).py b/release/scripts/presets/camera/APS-C_(Canon).py index 55f20ce0eac..484929a54e7 100644 --- a/release/scripts/presets/camera/APS-C_(Canon).py +++ b/release/scripts/presets/camera/APS-C_(Canon).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 22.30 bpy.context.camera.sensor_height = 14.90 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/APS-H_(Canon).py b/release/scripts/presets/camera/APS-H_(Canon).py index d63f733280b..d3b61d1aa46 100644 --- a/release/scripts/presets/camera/APS-H_(Canon).py +++ b/release/scripts/presets/camera/APS-H_(Canon).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 27.90 bpy.context.camera.sensor_height = 18.60 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Analog_16mm.py b/release/scripts/presets/camera/Analog_16mm.py index aa98eaf2408..a290839c8e0 100644 --- a/release/scripts/presets/camera/Analog_16mm.py +++ b/release/scripts/presets/camera/Analog_16mm.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 10.26 bpy.context.camera.sensor_height = 7.49 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Analog_35mm.py b/release/scripts/presets/camera/Analog_35mm.py index a0dee1f0166..fe3338dd292 100644 --- a/release/scripts/presets/camera/Analog_35mm.py +++ b/release/scripts/presets/camera/Analog_35mm.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 22 bpy.context.camera.sensor_height = 16 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Analog_65mm.py b/release/scripts/presets/camera/Analog_65mm.py index 8de91ac0ee3..d6eb9c32283 100644 --- a/release/scripts/presets/camera/Analog_65mm.py +++ b/release/scripts/presets/camera/Analog_65mm.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 52.45 bpy.context.camera.sensor_height = 23.01 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Analog_IMAX.py b/release/scripts/presets/camera/Analog_IMAX.py index 5a445f3de8c..b71b910dee0 100644 --- a/release/scripts/presets/camera/Analog_IMAX.py +++ b/release/scripts/presets/camera/Analog_IMAX.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 71.41 bpy.context.camera.sensor_height = 52.63 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Analog_Super_16.py b/release/scripts/presets/camera/Analog_Super_16.py index a340a31dc25..f76238c69d3 100644 --- a/release/scripts/presets/camera/Analog_Super_16.py +++ b/release/scripts/presets/camera/Analog_Super_16.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 12.35 bpy.context.camera.sensor_height = 7.42 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Analog_Super_35.py b/release/scripts/presets/camera/Analog_Super_35.py index 3c8f1837253..b22ff545c68 100644 --- a/release/scripts/presets/camera/Analog_Super_35.py +++ b/release/scripts/presets/camera/Analog_Super_35.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 24.89 bpy.context.camera.sensor_height = 18.66 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Arri_Alexa_65.py b/release/scripts/presets/camera/Arri_Alexa_65.py index b1467709949..24d03e022ae 100644 --- a/release/scripts/presets/camera/Arri_Alexa_65.py +++ b/release/scripts/presets/camera/Arri_Alexa_65.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 54.12 bpy.context.camera.sensor_height = 25.58 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Arri_Alexa_LF.py b/release/scripts/presets/camera/Arri_Alexa_LF.py index 1cde94fce8d..430fdc996a6 100644 --- a/release/scripts/presets/camera/Arri_Alexa_LF.py +++ b/release/scripts/presets/camera/Arri_Alexa_LF.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 36.70 bpy.context.camera.sensor_height = 25.54 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Arri_Alexa_Mini_&_SXT.py b/release/scripts/presets/camera/Arri_Alexa_Mini_&_SXT.py index 0f61d35a0f9..90998bc0da0 100644 --- a/release/scripts/presets/camera/Arri_Alexa_Mini_&_SXT.py +++ b/release/scripts/presets/camera/Arri_Alexa_Mini_&_SXT.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 29.90 bpy.context.camera.sensor_height = 15.77 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blackmagic_Pocket_&_Studio.py b/release/scripts/presets/camera/Blackmagic_Pocket_&_Studio.py index 260bfbaf94f..bb2b172919e 100644 --- a/release/scripts/presets/camera/Blackmagic_Pocket_&_Studio.py +++ b/release/scripts/presets/camera/Blackmagic_Pocket_&_Studio.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 12.48 bpy.context.camera.sensor_height = 7.02 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blackmagic_Pocket_4K.py b/release/scripts/presets/camera/Blackmagic_Pocket_4K.py index dc057397828..4b735283c8b 100644 --- a/release/scripts/presets/camera/Blackmagic_Pocket_4K.py +++ b/release/scripts/presets/camera/Blackmagic_Pocket_4K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 18.96 bpy.context.camera.sensor_height = 10.00 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blackmagic_Pocket_6k.py b/release/scripts/presets/camera/Blackmagic_Pocket_6k.py index a483f3d5f98..1a882f05786 100644 --- a/release/scripts/presets/camera/Blackmagic_Pocket_6k.py +++ b/release/scripts/presets/camera/Blackmagic_Pocket_6k.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 23.10 bpy.context.camera.sensor_height = 12.99 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blackmagic_URSA_4.6K.py b/release/scripts/presets/camera/Blackmagic_URSA_4.6K.py index c71e42d72d3..767d16984d8 100644 --- a/release/scripts/presets/camera/Blackmagic_URSA_4.6K.py +++ b/release/scripts/presets/camera/Blackmagic_URSA_4.6K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 25.34 bpy.context.camera.sensor_height = 14.25 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Foveon_(Sigma).py b/release/scripts/presets/camera/Foveon_(Sigma).py index e6a1a0ed344..6b35f29acaf 100644 --- a/release/scripts/presets/camera/Foveon_(Sigma).py +++ b/release/scripts/presets/camera/Foveon_(Sigma).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 20.70 bpy.context.camera.sensor_height = 13.80 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Fullframe.py b/release/scripts/presets/camera/Fullframe.py index 95fb4afc10b..c8017331b28 100644 --- a/release/scripts/presets/camera/Fullframe.py +++ b/release/scripts/presets/camera/Fullframe.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 36 bpy.context.camera.sensor_height = 24 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/MFT.py b/release/scripts/presets/camera/MFT.py index bc0dd49baa8..7441f1aea76 100644 --- a/release/scripts/presets/camera/MFT.py +++ b/release/scripts/presets/camera/MFT.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 17.3 bpy.context.camera.sensor_height = 13.0 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Medium-format_(Hasselblad).py b/release/scripts/presets/camera/Medium-format_(Hasselblad).py index e9b16024b79..d03a4f22db7 100644 --- a/release/scripts/presets/camera/Medium-format_(Hasselblad).py +++ b/release/scripts/presets/camera/Medium-format_(Hasselblad).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 44 bpy.context.camera.sensor_height = 33 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/RED_Dragon_5K.py b/release/scripts/presets/camera/RED_Dragon_5K.py index fa95a98f8c4..e8b990d4d00 100644 --- a/release/scripts/presets/camera/RED_Dragon_5K.py +++ b/release/scripts/presets/camera/RED_Dragon_5K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 25.60 bpy.context.camera.sensor_height = 13.5 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/RED_Dragon_6K.py b/release/scripts/presets/camera/RED_Dragon_6K.py index 80f7ad1bbb8..982e2ab8e00 100644 --- a/release/scripts/presets/camera/RED_Dragon_6K.py +++ b/release/scripts/presets/camera/RED_Dragon_6K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 30.70 bpy.context.camera.sensor_height = 15.80 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/RED_Helium_8K.py b/release/scripts/presets/camera/RED_Helium_8K.py index 0f61d35a0f9..90998bc0da0 100644 --- a/release/scripts/presets/camera/RED_Helium_8K.py +++ b/release/scripts/presets/camera/RED_Helium_8K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 29.90 bpy.context.camera.sensor_height = 15.77 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/RED_Monstro_8K.py b/release/scripts/presets/camera/RED_Monstro_8K.py index 86c382624ab..1c8bc11dfaa 100644 --- a/release/scripts/presets/camera/RED_Monstro_8K.py +++ b/release/scripts/presets/camera/RED_Monstro_8K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 40.96 bpy.context.camera.sensor_height = 21.60 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/keyconfig/Blender.py b/release/scripts/presets/keyconfig/Blender.py index 222ee43432f..eb66c961472 100644 --- a/release/scripts/presets/keyconfig/Blender.py +++ b/release/scripts/presets/keyconfig/Blender.py @@ -103,8 +103,8 @@ class Prefs(bpy.types.KeyConfigPreferences): v3d_tilde_action: EnumProperty( name="Tilde Action", items=( - ('OBJECT_SWITCH', "Object Switch", - "Switch the active object under the cursor (when not in object mode)", + ('VIEW', "Navigate", + "View operations (useful for keyboards without a numpad)", 0), ('GIZMO', "Gizmos", "Control transform gizmos", @@ -113,7 +113,7 @@ class Prefs(bpy.types.KeyConfigPreferences): description=( "Action when 'Tilde' is pressed" ), - default='OBJECT_SWITCH', + default='VIEW', update=update_fn, ) diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 7f1039a975b..3527e993173 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -730,6 +730,8 @@ def km_user_interface(_params): ("anim.keyingset_button_add", {"type": 'K', "value": 'PRESS'}, None), ("anim.keyingset_button_remove", {"type": 'K', "value": 'PRESS', "alt": True}, None), ("ui.reset_default_button", {"type": 'BACK_SPACE', "value": 'PRESS'}, {"properties": [("all", True)]}), + # UI lists (polls check if there's a UI list under the cursor). + ("ui.list_start_filter", {"type": 'F', "value": 'PRESS', "ctrl": True}, None), ]) return keymap @@ -1084,7 +1086,13 @@ def km_view3d(params): {"properties": [("use_all_regions", True), ("center", False)]}), ("view3d.view_all", {"type": 'C', "value": 'PRESS', "shift": True}, {"properties": [("center", True)]}), - op_menu_pie("VIEW3D_MT_view_pie", {"type": 'D', "value": 'CLICK_DRAG'}), + op_menu_pie( + "VIEW3D_MT_view_pie" if params.v3d_tilde_action == 'VIEW' else "VIEW3D_MT_transform_gizmo_pie", + {"type": 'ACCENT_GRAVE', "value": params.pie_value}, + ), + *(() if not params.use_pie_click_drag else + (("view3d.navigate", {"type": 'ACCENT_GRAVE', "value": 'CLICK'}, None),)), + ("view3d.navigate", {"type": 'ACCENT_GRAVE', "value": 'PRESS', "shift": True}, None), ("view3d.navigate", {"type": 'ACCENT_GRAVE', "value": 'PRESS', "shift": True}, None), # Numpad views. ("view3d.view_camera", {"type": 'NUMPAD_0', "value": 'PRESS'}, None), @@ -1328,32 +1336,6 @@ def km_view3d(params): op_tool_cycle("builtin.select_box", {"type": 'W', "value": 'PRESS'}), ]) - # Tilda key. - if params.use_pie_click_drag: - items.extend([ - ("object.transfer_mode", - {"type": 'ACCENT_GRAVE', "value": 'CLICK' if params.use_pie_click_drag else 'PRESS'}, - None), - op_menu_pie( - "VIEW3D_MT_transform_gizmo_pie", - {"type": 'ACCENT_GRAVE', "value": 'CLICK_DRAG'}, - ) - ]) - else: - if params.v3d_tilde_action == 'OBJECT_SWITCH': - items.append( - ("object.transfer_mode", - {"type": 'ACCENT_GRAVE', "value": 'PRESS'}, - {"properties": [("use_eyedropper", False)]}) - ) - else: - items.append( - op_menu_pie( - "VIEW3D_MT_transform_gizmo_pie", - {"type": 'ACCENT_GRAVE', "value": 'PRESS'}, - ) - ) - return keymap @@ -2679,7 +2661,8 @@ def km_sequencer(params): {"properties": [("side", 'LEFT')]}), ("sequencer.select_side_of_frame", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, {"properties": [("side", 'RIGHT')]}), - + ("wm.context_toggle", {"type": 'TAB', "value": 'PRESS', "shift": True}, + {"properties": [("data_path", 'tool_settings.use_snap_sequencer')]}), *_template_items_context_menu("SEQUENCER_MT_context_menu", params.context_menu_event), ]) @@ -4113,7 +4096,7 @@ def km_pose(params): ("pose.bone_layers", {"type": 'M', "value": 'PRESS'}, None), ("transform.bbone_resize", {"type": 'S', "value": 'PRESS', "ctrl": True, "alt": True}, None), ("anim.keyframe_insert_menu", {"type": 'I', "value": 'PRESS'}, None), - ("anim.keyframe_delete", {"type": 'I', "value": 'PRESS', "alt": True}, None), + ("anim.keyframe_delete_v3d", {"type": 'I', "value": 'PRESS', "alt": True}, None), ("anim.keying_set_active_set", {"type": 'I', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), ("poselib.browse_interactive", {"type": 'L', "value": 'PRESS', "alt": True}, None), ("poselib.pose_add", {"type": 'L', "value": 'PRESS', "shift": True}, None), @@ -4185,7 +4168,7 @@ def km_object_mode(params): ("wm.context_toggle", {"type": 'PERIOD', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'tool_settings.use_transform_data_origin')]}), ("anim.keyframe_insert_menu", {"type": 'I', "value": 'PRESS'}, None), - ("anim.keyframe_delete", {"type": 'I', "value": 'PRESS', "alt": True}, None), + ("anim.keyframe_delete_v3d", {"type": 'I', "value": 'PRESS', "alt": True}, None), ("anim.keying_set_active_set", {"type": 'I', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), ("collection.create", {"type": 'G', "value": 'PRESS', "ctrl": True}, None), ("collection.objects_remove", {"type": 'G', "value": 'PRESS', "ctrl": True, "alt": True}, None), @@ -5071,6 +5054,11 @@ def km_object_non_modal(params): ("object.origin_set", {"type": 'C', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), ]) else: + items.extend([ + # NOTE: this shortcut (while not temporary) is not ideal, see: T89757. + ("object.transfer_mode", {"type": 'Q', "value": 'PRESS', "alt": True}, None), + ]) + if params.use_pie_click_drag: items.extend([ ("object.mode_set", {"type": 'TAB', "value": 'CLICK'}, @@ -5551,6 +5539,7 @@ def km_view3d_walk_modal(_params): ("DECELERATE", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "any": True, "repeat": True}, None), ("ACCELERATE", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "any": True}, None), ("DECELERATE", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "any": True}, None), + ("AXIS_LOCK_Z", {"type": 'Z', "value": 'PRESS'}, None), ]) return keymap diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index b0144672745..714126903d8 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -3015,7 +3015,7 @@ def km_pose(params): ("anim.keyframe_insert_by_name", {"type": 'R', "value": 'PRESS', "shift": True}, {"properties": [("type", 'Scaling')]}), - ("anim.keyframe_delete", {"type": 'S', "value": 'PRESS', "alt": True}, None), + ("anim.keyframe_delete_v3d", {"type": 'S', "value": 'PRESS', "alt": True}, None), ("anim.keying_set_active_set", {"type": 'S', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), *_template_items_context_menu("VIEW3D_MT_pose_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), # Tools @@ -3086,7 +3086,7 @@ def km_object_mode(params): {"properties": [("type", 'Rotation')]}), ("anim.keyframe_insert_by_name", {"type": 'R', "value": 'PRESS', "shift": True}, {"properties": [("type", 'Scaling')]}), - ("anim.keyframe_delete", {"type": 'S', "value": 'PRESS', "alt": True}, None), + ("anim.keyframe_delete_v3d", {"type": 'S', "value": 'PRESS', "alt": True}, None), ("anim.keying_set_active_set", {"type": 'S', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), *_template_items_context_menu("VIEW3D_MT_object_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("object.move_to_collection", {"type": 'G', "value": 'PRESS', "ctrl": True}, None), diff --git a/release/scripts/presets/tracking_camera/1_inch.py b/release/scripts/presets/tracking_camera/1_inch.py index 72b039fb978..97e87b8c5a7 100644 --- a/release/scripts/presets/tracking_camera/1_inch.py +++ b/release/scripts/presets/tracking_camera/1_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 13.2 bpy.context.camera.sensor_height = 8.80 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py b/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py index 38e09182de6..8b0dc3cea1d 100644 --- a/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py +++ b/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 7.18 bpy.context.camera.sensor_height = 5.32 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py b/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py index 4d55738f4ed..bd6808da082 100644 --- a/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py +++ b/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 6.17 bpy.context.camera.sensor_height = 4.55 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py b/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py index cbdb6f3cbe0..90f60e7d7f0 100644 --- a/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py +++ b/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 5.76 bpy.context.camera.sensor_height = 4.29 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py b/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py index 5ccfa4ab555..4a9591803d0 100644 --- a/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py +++ b/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 5.37 bpy.context.camera.sensor_height = 4.04 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py b/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py index 1963f7ec048..5f31b9ec49c 100644 --- a/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py +++ b/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 4.54 bpy.context.camera.sensor_height = 3.42 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/2_slash_3_inch.py b/release/scripts/presets/tracking_camera/2_slash_3_inch.py index 25b46016800..eb463a31af7 100644 --- a/release/scripts/presets/tracking_camera/2_slash_3_inch.py +++ b/release/scripts/presets/tracking_camera/2_slash_3_inch.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 8.8 bpy.context.camera.sensor_height = 6.6 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/APS-C.py b/release/scripts/presets/tracking_camera/APS-C.py index 84e40825248..4031e8bae71 100644 --- a/release/scripts/presets/tracking_camera/APS-C.py +++ b/release/scripts/presets/tracking_camera/APS-C.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 23.6 bpy.context.camera.sensor_height = 15.6 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/APS-C_(Canon).py b/release/scripts/presets/tracking_camera/APS-C_(Canon).py index 55f20ce0eac..484929a54e7 100644 --- a/release/scripts/presets/tracking_camera/APS-C_(Canon).py +++ b/release/scripts/presets/tracking_camera/APS-C_(Canon).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 22.30 bpy.context.camera.sensor_height = 14.90 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/APS-H_(Canon).py b/release/scripts/presets/tracking_camera/APS-H_(Canon).py index d63f733280b..d3b61d1aa46 100644 --- a/release/scripts/presets/tracking_camera/APS-H_(Canon).py +++ b/release/scripts/presets/tracking_camera/APS-H_(Canon).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 27.90 bpy.context.camera.sensor_height = 18.60 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Analog_16mm.py b/release/scripts/presets/tracking_camera/Analog_16mm.py index aa98eaf2408..a290839c8e0 100644 --- a/release/scripts/presets/tracking_camera/Analog_16mm.py +++ b/release/scripts/presets/tracking_camera/Analog_16mm.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 10.26 bpy.context.camera.sensor_height = 7.49 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Analog_35mm.py b/release/scripts/presets/tracking_camera/Analog_35mm.py index a0dee1f0166..fe3338dd292 100644 --- a/release/scripts/presets/tracking_camera/Analog_35mm.py +++ b/release/scripts/presets/tracking_camera/Analog_35mm.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 22 bpy.context.camera.sensor_height = 16 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Analog_65mm.py b/release/scripts/presets/tracking_camera/Analog_65mm.py index 8de91ac0ee3..d6eb9c32283 100644 --- a/release/scripts/presets/tracking_camera/Analog_65mm.py +++ b/release/scripts/presets/tracking_camera/Analog_65mm.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 52.45 bpy.context.camera.sensor_height = 23.01 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Analog_IMAX.py b/release/scripts/presets/tracking_camera/Analog_IMAX.py index 5a445f3de8c..b71b910dee0 100644 --- a/release/scripts/presets/tracking_camera/Analog_IMAX.py +++ b/release/scripts/presets/tracking_camera/Analog_IMAX.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 71.41 bpy.context.camera.sensor_height = 52.63 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Analog_Super_16.py b/release/scripts/presets/tracking_camera/Analog_Super_16.py index a340a31dc25..f76238c69d3 100644 --- a/release/scripts/presets/tracking_camera/Analog_Super_16.py +++ b/release/scripts/presets/tracking_camera/Analog_Super_16.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 12.35 bpy.context.camera.sensor_height = 7.42 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Analog_Super_35.py b/release/scripts/presets/tracking_camera/Analog_Super_35.py index 3c8f1837253..b22ff545c68 100644 --- a/release/scripts/presets/tracking_camera/Analog_Super_35.py +++ b/release/scripts/presets/tracking_camera/Analog_Super_35.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 24.89 bpy.context.camera.sensor_height = 18.66 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa_65.py b/release/scripts/presets/tracking_camera/Arri_Alexa_65.py index b1467709949..24d03e022ae 100644 --- a/release/scripts/presets/tracking_camera/Arri_Alexa_65.py +++ b/release/scripts/presets/tracking_camera/Arri_Alexa_65.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 54.12 bpy.context.camera.sensor_height = 25.58 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py b/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py index 1cde94fce8d..430fdc996a6 100644 --- a/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py +++ b/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 36.70 bpy.context.camera.sensor_height = 25.54 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa_Mini_&_SXT.py b/release/scripts/presets/tracking_camera/Arri_Alexa_Mini_&_SXT.py index 0f61d35a0f9..90998bc0da0 100644 --- a/release/scripts/presets/tracking_camera/Arri_Alexa_Mini_&_SXT.py +++ b/release/scripts/presets/tracking_camera/Arri_Alexa_Mini_&_SXT.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 29.90 bpy.context.camera.sensor_height = 15.77 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_&_Studio.py b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_&_Studio.py index 260bfbaf94f..bb2b172919e 100644 --- a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_&_Studio.py +++ b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_&_Studio.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 12.48 bpy.context.camera.sensor_height = 7.02 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_4K.py b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_4K.py index dc057397828..4b735283c8b 100644 --- a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_4K.py +++ b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_4K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 18.96 bpy.context.camera.sensor_height = 10.00 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_6k.py b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_6k.py index a483f3d5f98..1a882f05786 100644 --- a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_6k.py +++ b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_6k.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 23.10 bpy.context.camera.sensor_height = 12.99 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Blackmagic_URSA_4.6K.py b/release/scripts/presets/tracking_camera/Blackmagic_URSA_4.6K.py index c71e42d72d3..767d16984d8 100644 --- a/release/scripts/presets/tracking_camera/Blackmagic_URSA_4.6K.py +++ b/release/scripts/presets/tracking_camera/Blackmagic_URSA_4.6K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 25.34 bpy.context.camera.sensor_height = 14.25 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Foveon_(Sigma).py b/release/scripts/presets/tracking_camera/Foveon_(Sigma).py index e6a1a0ed344..6b35f29acaf 100644 --- a/release/scripts/presets/tracking_camera/Foveon_(Sigma).py +++ b/release/scripts/presets/tracking_camera/Foveon_(Sigma).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 20.70 bpy.context.camera.sensor_height = 13.80 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Fullframe.py b/release/scripts/presets/tracking_camera/Fullframe.py index 95fb4afc10b..c8017331b28 100644 --- a/release/scripts/presets/tracking_camera/Fullframe.py +++ b/release/scripts/presets/tracking_camera/Fullframe.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 36 bpy.context.camera.sensor_height = 24 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/MFT.py b/release/scripts/presets/tracking_camera/MFT.py index bc0dd49baa8..7441f1aea76 100644 --- a/release/scripts/presets/tracking_camera/MFT.py +++ b/release/scripts/presets/tracking_camera/MFT.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 17.3 bpy.context.camera.sensor_height = 13.0 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/Medium-format_(Hasselblad).py b/release/scripts/presets/tracking_camera/Medium-format_(Hasselblad).py index e9b16024b79..d03a4f22db7 100644 --- a/release/scripts/presets/tracking_camera/Medium-format_(Hasselblad).py +++ b/release/scripts/presets/tracking_camera/Medium-format_(Hasselblad).py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 44 bpy.context.camera.sensor_height = 33 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/RED_Dragon_5K.py b/release/scripts/presets/tracking_camera/RED_Dragon_5K.py index fa95a98f8c4..e8b990d4d00 100644 --- a/release/scripts/presets/tracking_camera/RED_Dragon_5K.py +++ b/release/scripts/presets/tracking_camera/RED_Dragon_5K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 25.60 bpy.context.camera.sensor_height = 13.5 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/RED_Dragon_6K.py b/release/scripts/presets/tracking_camera/RED_Dragon_6K.py index 80f7ad1bbb8..982e2ab8e00 100644 --- a/release/scripts/presets/tracking_camera/RED_Dragon_6K.py +++ b/release/scripts/presets/tracking_camera/RED_Dragon_6K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 30.70 bpy.context.camera.sensor_height = 15.80 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/RED_Helium_8K.py b/release/scripts/presets/tracking_camera/RED_Helium_8K.py index 0f61d35a0f9..90998bc0da0 100644 --- a/release/scripts/presets/tracking_camera/RED_Helium_8K.py +++ b/release/scripts/presets/tracking_camera/RED_Helium_8K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 29.90 bpy.context.camera.sensor_height = 15.77 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/tracking_camera/RED_Monstro_8K.py b/release/scripts/presets/tracking_camera/RED_Monstro_8K.py index 86c382624ab..1c8bc11dfaa 100644 --- a/release/scripts/presets/tracking_camera/RED_Monstro_8K.py +++ b/release/scripts/presets/tracking_camera/RED_Monstro_8K.py @@ -1,4 +1,4 @@ import bpy bpy.context.camera.sensor_width = 40.96 bpy.context.camera.sensor_height = 21.60 -bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file +bpy.context.camera.sensor_fit = 'HORIZONTAL' |