griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Richard Antalik
2024-10-29 21:52:44 +01:00
parent 7dc43b7dd2 1fadc4b5e3
commit 04509992c5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_sequencer/sequencer_select.cc
View File

@@ -1406,11 +1406,6 @@ static int sequencer_select_handle_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
if (sequencer_retiming_mode_is_active(C) && retiming_keys_can_be_displayed(CTX_wm_space_seq(C)))
{
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
MouseCoords mouse_co(v2d, RNA_int_get(op->ptr, "mouse_x"), RNA_int_get(op->ptr, "mouse_y"));
StripSelection selection = ED_sequencer_pick_strip_and_handle(scene, v2d, mouse_co.view);
@@ -1449,6 +1444,7 @@ static int sequencer_select_handle_exec(bContext *C, wmOperator *op)
sequencer_select_connected_strips(selection);
}
SEQ_retiming_selection_clear(ed);
sequencer_select_do_updates(C, scene);
sequencer_select_set_active(scene, selection.seq1);
return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;