Merge branch 'master' into blender2.8
This commit is contained in:
commit
31ad03dbde
|
@ -3489,7 +3489,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op)
|
|||
bool proxy_50 = RNA_boolean_get(op->ptr, "proxy_50");
|
||||
bool proxy_75 = RNA_boolean_get(op->ptr, "proxy_75");
|
||||
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;
|
||||
|
||||
if (ed == NULL || !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) {
|
||||
|
@ -3525,7 +3525,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op)
|
|||
else
|
||||
seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_100;
|
||||
|
||||
if (!override)
|
||||
if (!overwrite)
|
||||
seq->strip->proxy->build_flags |= SEQ_PROXY_SKIP_EXISTING;
|
||||
else
|
||||
seq->strip->proxy->build_flags &= ~SEQ_PROXY_SKIP_EXISTING;
|
||||
|
@ -3557,7 +3557,7 @@ void SEQUENCER_OT_enable_proxies(wmOperatorType *ot)
|
|||
RNA_def_boolean(ot->srna, "proxy_50", false, "50%", "");
|
||||
RNA_def_boolean(ot->srna, "proxy_75", false, "75%", "");
|
||||
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 */
|
||||
|
|
Loading…
Reference in New Issue