[Bf-blender-cvs] [a9696f04a01] master: Fix T90964: Strip can't be deleted if cursor is at bottom of timeline
Richard Antalik
noreply at git.blender.org
Thu Jun 30 20:47:15 CEST 2022
Commit: a9696f04a012ce23ef419afe489378d1ce840638
Author: Richard Antalik
Date: Thu Jun 30 20:41:09 2022 +0200
Branches: master
https://developer.blender.org/rBa9696f04a012ce23ef419afe489378d1ce840638
Fix T90964: Strip can't be deleted if cursor is at bottom of timeline
Caused by hard-coded width of markers region causing operator to pass
through.
Execute operator if there are no markers.
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 79eeb3c0374..cb95e9a75de 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1703,8 +1703,10 @@ static int sequencer_delete_exec(bContext *C, wmOperator *op)
static int sequencer_delete_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
ARegion *region = CTX_wm_region(C);
+ Scene *scene = CTX_data_scene(C);
+ ListBase *markers = &scene->markers;
- if (region->regiontype == RGN_TYPE_WINDOW) {
+ if (region->regiontype == RGN_TYPE_WINDOW && !BLI_listbase_is_empty(markers)) {
/* Bounding box of 30 pixels is used for markers shortcuts,
* prevent conflict with markers shortcuts here.
*/
More information about the Bf-blender-cvs
mailing list