[Bf-blender-cvs] [587f77c45dc] draw-deferred-compilation-experiment: VSE: Add frame selected operator for preview
Commit: 587f77c45dc5bce2021d18c28ded4525695d8ab1 Author: ok what Date: Thu Apr 21 00:38:39 2022 +0200 Branches: draw-deferred-compilation-experiment https://developer.blender.org/rB587f77c45dc5bce2021d18c28ded4525695d8ab1 VSE: Add frame selected operator for preview This operator moves the view to show the selected visible strips. Reviewed By: ISS Differential Revision: https://developer.blender.org/D14222 === M release/scripts/presets/keyconfig/keymap_data/blender_default.py M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py M release/scripts/startup/bl_ui/space_sequencer.py M source/blender/editors/space_sequencer/sequencer_view.c M source/blender/editors/transform/transform_gizmo_2d.c M source/blender/sequencer/SEQ_transform.h M source/blender/sequencer/intern/strip_transform.c === diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 9b47a7b35b5..78620c41d1e 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -2960,6 +2960,7 @@ def km_sequencerpreview(params): ("sequencer.select_box", {"type": 'B', "value": 'PRESS'}, None), # View. +("sequencer.view_selected", {"type": 'NUMPAD_PERIOD', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'HOME', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None), ("sequencer.view_ghost_border", {"type": 'O', "value": 'PRESS'}, None), 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 e1977bf7df2..7faa418d74e 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -1866,6 +1866,7 @@ def km_sequencerpreview(params): ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'A', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None), +("sequencer.view_selected", {"type": 'F', "value": 'PRESS'}, None), ("sequencer.view_ghost_border", {"type": 'O', "value": 'PRESS'}, None), ("sequencer.view_zoom_ratio", {"type": 'NUMPAD_1', "value": 'PRESS'}, {"properties": [("ratio", 1.0)]}), diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index bbf9548a973..00ace072bda 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -429,9 +429,14 @@ class SEQUENCER_MT_view(Menu): layout.separator() +layout.operator_context = 'INVOKE_REGION_WIN' +if st.view_type == 'PREVIEW': +# See above (T32595) +layout.operator_context = 'INVOKE_REGION_PREVIEW' +layout.operator("sequencer.view_selected", text="Frame Selected") + if is_sequencer_view: layout.operator_context = 'INVOKE_REGION_WIN' -layout.operator("sequencer.view_selected", text="Frame Selected") layout.operator("sequencer.view_all") layout.operator("view2d.zoom_border", text="Zoom") diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index 4d245b9ddaa..c407dad623d 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -22,9 +22,11 @@ #include "RNA_define.h" +#include "SEQ_iterator.h" #include "SEQ_select.h" #include "SEQ_sequencer.h" #include "SEQ_time.h" +#include "SEQ_transform.h" /* For menu, popup, icons, etc. */ #include "ED_anim_api.h" @@ -260,14 +262,30 @@ void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) /** \name Frame Selected Operator * \{ */ -static int sequencer_view_selected_exec(bContext *C, wmOperator *op) +static void seq_view_collection_rect_preview(Scene *scene, SeqCollection *strips, rctf *rect) +{ + float mi
[Bf-blender-cvs] [e16ff4132e3] master: VSE: Add frame selected operator for preview
Commit: e16ff4132e35cab6a757105741b8563679bda0bd Author: ok what Date: Thu Apr 21 00:38:39 2022 +0200 Branches: master https://developer.blender.org/rBe16ff4132e35cab6a757105741b8563679bda0bd VSE: Add frame selected operator for preview This operator moves the view to show the selected visible strips. Reviewed By: ISS Differential Revision: https://developer.blender.org/D14222 === M release/scripts/presets/keyconfig/keymap_data/blender_default.py M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py M release/scripts/startup/bl_ui/space_sequencer.py M source/blender/editors/space_sequencer/sequencer_view.c M source/blender/editors/transform/transform_gizmo_2d.c M source/blender/sequencer/SEQ_transform.h M source/blender/sequencer/intern/strip_transform.c === diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 9b47a7b35b5..78620c41d1e 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -2960,6 +2960,7 @@ def km_sequencerpreview(params): ("sequencer.select_box", {"type": 'B', "value": 'PRESS'}, None), # View. +("sequencer.view_selected", {"type": 'NUMPAD_PERIOD', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'HOME', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None), ("sequencer.view_ghost_border", {"type": 'O', "value": 'PRESS'}, None), 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 e1977bf7df2..7faa418d74e 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -1866,6 +1866,7 @@ def km_sequencerpreview(params): ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'A', "value": 'PRESS'}, None), ("sequencer.view_all_preview", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None), +("sequencer.view_selected", {"type": 'F', "value": 'PRESS'}, None), ("sequencer.view_ghost_border", {"type": 'O', "value": 'PRESS'}, None), ("sequencer.view_zoom_ratio", {"type": 'NUMPAD_1', "value": 'PRESS'}, {"properties": [("ratio", 1.0)]}), diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index bbf9548a973..00ace072bda 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -429,9 +429,14 @@ class SEQUENCER_MT_view(Menu): layout.separator() +layout.operator_context = 'INVOKE_REGION_WIN' +if st.view_type == 'PREVIEW': +# See above (T32595) +layout.operator_context = 'INVOKE_REGION_PREVIEW' +layout.operator("sequencer.view_selected", text="Frame Selected") + if is_sequencer_view: layout.operator_context = 'INVOKE_REGION_WIN' -layout.operator("sequencer.view_selected", text="Frame Selected") layout.operator("sequencer.view_all") layout.operator("view2d.zoom_border", text="Zoom") diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index 4d245b9ddaa..c407dad623d 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -22,9 +22,11 @@ #include "RNA_define.h" +#include "SEQ_iterator.h" #include "SEQ_select.h" #include "SEQ_sequencer.h" #include "SEQ_time.h" +#include "SEQ_transform.h" /* For menu, popup, icons, etc. */ #include "ED_anim_api.h" @@ -260,14 +262,30 @@ void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) /** \name Frame Selected Operator * \{ */ -static int sequencer_view_selected_exec(bContext *C, wmOperator *op) +static void seq_view_collection_rect_preview(Scene *scene, SeqCollection *strips, rctf *rect) +{ + float min[2], max[2]; + SEQ_image