Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2021-01-25 07:09:13 +0300
committerRichard Antalik <richardantalik@gmail.com>2021-01-25 07:09:13 +0300
commit6d21703e8951bfb63ee3aab0bae634548e477e0a (patch)
tree98af1d9155a3155da2c50aab315a24e4e6bae2b5 /source/blender/editors/space_sequencer
parent77b51d4e583da417a004391724ba945d3f7de19d (diff)
parente16c786022c48d9679ea306504c06ac25677e553 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_proxy.c7
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;