diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 15 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/space_clip.c | 5 |
2 files changed, 6 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index bcc68c02f9b..76cb666c342 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -123,9 +123,9 @@ class CLIP_HT_header(Header): row = layout.row() row.template_ID(sc, "clip", open="clip.open") - layout.prop(sc, "mode", text="") - if clip: + layout.prop(sc, "mode", text="") + row = layout.row() row.template_ID(sc, "mask", new="mask.new") @@ -1332,17 +1332,6 @@ class CLIP_MT_tracking_specials(Menu): text="Unlock Tracks").action = 'UNLOCK' -class CLIP_MT_select_mode(Menu): - bl_label = "Select Mode" - - def draw(self, context): - layout = self.layout - - layout.operator_context = 'INVOKE_REGION_WIN' - - layout.operator_enum("clip.mode_set", "mode") - - class CLIP_MT_camera_presets(Menu): """Predefined tracking camera intrinsics""" bl_label = "Camera Presets" diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 9b7c6663df6..0ee05cac0b9 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -577,7 +577,10 @@ static void clip_keymap(struct wmKeyConfig *keyconf) RNA_boolean_set(kmi->ptr, "sequence", TRUE); /* mode */ - WM_keymap_add_menu(keymap, "CLIP_MT_select_mode", TABKEY, KM_PRESS, 0, 0); + kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", TABKEY, KM_PRESS, 0, 0); + RNA_string_set(kmi->ptr, "data_path", "space_data.mode"); + RNA_string_set(kmi->ptr, "value_1", "TRACKING"); + RNA_string_set(kmi->ptr, "value_2", "MASK"); WM_keymap_add_item(keymap, "CLIP_OT_solve_camera", SKEY, KM_PRESS, KM_SHIFT, 0); |