archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Sequence editor: Renamed "Override" to "Overwrite" in "Set Selected Strip Proxies"

Browse Source 
The option has always (un)set the "Overwrite" flag on all strips. Calling
it "Override" seems misleading, since even when unchecking it, it overrides
whatever was set on the selected strips. It really just (un)sets the
"Overwrite" flag, and now it is also labeled as such.
This commit is contained in:
Sybren A. Stüvel
2017-07-13 16:26:19 +02:00
parent 248bba81e7
commit a651f5da66
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@@ -3512,7 +3512,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op)
bool proxy_50 = RNA_boolean_get(op->ptr, "proxy_50"); bool proxy_50 = RNA_boolean_get(op->ptr, "proxy_50");
bool proxy_75 = RNA_boolean_get(op->ptr, "proxy_75"); bool proxy_75 = RNA_boolean_get(op->ptr, "proxy_75");
bool proxy_100 = RNA_boolean_get(op->ptr, "proxy_100"); bool proxy_100 = RNA_boolean_get(op->ptr, "proxy_100");
bool override = RNA_boolean_get(op->ptr, "override"); bool overwrite = RNA_boolean_get(op->ptr, "overwrite");
bool turnon = true; bool turnon = true;
if (ed == NULL || !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) { if (ed == NULL || !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) {
@@ -3548,7 +3548,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op)
else else
seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_100; seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_100;
if (!override) if (!overwrite)
seq->strip->proxy->build_flags |= SEQ_PROXY_SKIP_EXISTING; seq->strip->proxy->build_flags |= SEQ_PROXY_SKIP_EXISTING;
else else
seq->strip->proxy->build_flags &= ~SEQ_PROXY_SKIP_EXISTING; seq->strip->proxy->build_flags &= ~SEQ_PROXY_SKIP_EXISTING;
@@ -3580,7 +3580,7 @@ void SEQUENCER_OT_enable_proxies(wmOperatorType *ot)
RNA_def_boolean(ot->srna, "proxy_50", false, "50%", ""); RNA_def_boolean(ot->srna, "proxy_50", false, "50%", "");
RNA_def_boolean(ot->srna, "proxy_75", false, "75%", ""); RNA_def_boolean(ot->srna, "proxy_75", false, "75%", "");
RNA_def_boolean(ot->srna, "proxy_100", false, "100%", ""); RNA_def_boolean(ot->srna, "proxy_100", false, "100%", "");
RNA_def_boolean(ot->srna, "override", false, "Override", ""); RNA_def_boolean(ot->srna, "overwrite", false, "Overwrite", "");
} }
/* change ops */ /* change ops */