[Bf-blender-cvs] [a52f6d7a31e] master: Fix T66269: Menu for Extrapolation Mode is disabled in Graph Editor

Sybren A. Stüvel noreply at git.blender.org
Tue Mar 10 14:18:32 CET 2020


Commit: a52f6d7a31e9ef52ba5f8f8c4e83a59fc2c8b667
Author: Sybren A. Stüvel
Date:   Tue Mar 10 14:18:19 2020 +0100
Branches: master
https://developer.blender.org/rBa52f6d7a31e9ef52ba5f8f8c4e83a59fc2c8b667

Fix T66269: Menu for Extrapolation Mode is disabled in Graph Editor

The Extrapolation Mode menu in the graph editor channel list was
incorrectly using the operator for the Action/Dopesheet editor. The
operator was even missing in the generic dopesheet hotkeys, so
{key Shift E} was listed as hotkey but didn't work. This is now all
fixed.

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_ui/space_dopesheet.py

===================================================================

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index ca7c3245713..6b0aee4e654 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1963,7 +1963,8 @@ def km_dopesheet_generic(_params):
             sidebar_key={"type": 'N', "value": 'PRESS'},
         ),
         ("wm.context_set_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
-         {"properties": [("data_path", 'area.type'), ("value", 'GRAPH_EDITOR')]})
+         {"properties": [("data_path", 'area.type'), ("value", 'GRAPH_EDITOR')]}),
+        ("action.extrapolation_type", {"type": 'E', "value": 'PRESS', "shift": True}, None),
     ])
 
     return keymap
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index f12d8597d37..8117445e4af 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -619,7 +619,7 @@ class DOPESHEET_MT_context_menu(Menu):
 class DOPESHEET_MT_channel_context_menu(Menu):
     bl_label = "Dope Sheet Channel Context Menu"
 
-    def draw(self, _context):
+    def draw(self, context):
         layout = self.layout
 
         layout.operator("anim.channels_setting_enable", text="Mute Channels").type = 'MUTE'
@@ -634,7 +634,12 @@ class DOPESHEET_MT_channel_context_menu(Menu):
 
         layout.separator()
         layout.operator("anim.channels_editable_toggle")
-        layout.operator_menu_enum("action.extrapolation_type", "type", text="Extrapolation Mode")
+
+        if bpy.ops.graph.extrapolation_type.poll(context.copy()):
+            operator = "graph.extrapolation_type"
+        else:
+            operator = "action.extrapolation_type"
+        layout.operator_menu_enum(operator, "type", text="Extrapolation Mode")
 
         layout.separator()
         layout.operator("anim.channels_expand")



More information about the Bf-blender-cvs mailing list