diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-01-25 06:42:46 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-01-25 06:42:46 +0300 |
commit | 744fa41e7ef3a16c3efa46e07183b66f1590584d (patch) | |
tree | 60ddbb179b1ef41b662ccfb470cccf6784f34cdc /source/blender/editors/space_sequencer | |
parent | 652dd4e27fb84913e2c080bafa6c9afcc9057da5 (diff) |
Fix T83266: Proxy building with meta strips fails
Building proxy with meta strip selected resulted in attempt to render
meta strip itself and save result as image as is done when building
image proxies.
Remove meta strip from list of supported strips.
Multicam, Meta and scene strip are cleared from poll function in UI as well.
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D10001
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_proxy.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.c b/source/blender/editors/space_sequencer/sequencer_proxy.c index b04363a4f33..b208f320591 100644 --- a/source/blender/editors/space_sequencer/sequencer_proxy.c +++ b/source/blender/editors/space_sequencer/sequencer_proxy.c @@ -145,8 +145,7 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports) bool selected = false; /* Check for no selected strips */ SEQ_CURRENT_BEGIN (ed, seq) { - if (!ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META) || - (seq->flag & SELECT) == 0) { + if (!ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE) || (seq->flag & SELECT) == 0) { continue; } @@ -284,7 +283,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) SEQ_CURRENT_BEGIN (ed, seq) { if ((seq->flag & SELECT)) { - if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META)) { + if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE)) { SEQ_proxy_set(seq, turnon); if (seq->strip->proxy == NULL) { continue; @@ -339,7 +338,7 @@ void SEQUENCER_OT_enable_proxies(wmOperatorType *ot) /* Identifiers. */ ot->name = "Set Selected Strip Proxies"; ot->idname = "SEQUENCER_OT_enable_proxies"; - ot->description = "Enable selected proxies on all selected Movie, Image and Meta strips"; + ot->description = "Enable selected proxies on all selected Movie and Image strips"; /* Api callbacks. */ ot->invoke = sequencer_enable_proxies_invoke; |