From 078bc6a7c284641b1d114cbe81e3b567cdd0493c Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Wed, 15 Oct 2025 20:08:28 +0200 Subject: [PATCH] VSE: Allow all strips to be used as modifier masks It was requested to allow strips inside of meta strips to be used as masks for modifiers. There is need for mask is to be shared between multiple strips in multiple meta strips. More discussion is in #146970. Pull Request: https://projects.blender.org/blender/blender/pulls/148097 --- .../blender/sequencer/intern/modifiers/modifier.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/source/blender/sequencer/intern/modifiers/modifier.cc b/source/blender/sequencer/intern/modifiers/modifier.cc index 476a47f5553..c31c7a10340 100644 --- a/source/blender/sequencer/intern/modifiers/modifier.cc +++ b/source/blender/sequencer/intern/modifiers/modifier.cc @@ -159,18 +159,10 @@ void draw_mask_input_type_settings(const bContext *C, uiLayout *layout, PointerR row->prop(ptr, "input_mask_type", UI_ITEM_R_EXPAND, IFACE_("Type"), ICON_NONE); if (input_mask_type == STRIP_MASK_INPUT_STRIP) { - MetaStack *ms = meta_stack_active_get(ed); - PointerRNA sequences_object; - if (ms) { - sequences_object = RNA_pointer_create_discrete( - &sequencer_scene->id, &RNA_MetaStrip, ms->parent_strip); - } - else { - sequences_object = RNA_pointer_create_discrete( - &sequencer_scene->id, &RNA_SequenceEditor, ed); - } + PointerRNA sequences_object = RNA_pointer_create_discrete( + &sequencer_scene->id, &RNA_SequenceEditor, ed); col->prop_search( - ptr, "input_mask_strip", &sequences_object, "strips", IFACE_("Mask"), ICON_NONE); + ptr, "input_mask_strip", &sequences_object, "strips_all", IFACE_("Mask"), ICON_NONE); } else { col->prop(ptr, "input_mask_id", UI_ITEM_NONE, std::nullopt, ICON_NONE);