diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-30 17:13:59 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-30 17:13:59 +0300 |
| commit | f7e8da6f5a5353c20a229e74d768384b5b1e5794 (patch) | |
| tree | 78257a76ad04687fe0d86993487f6b79d2d5f577 /source/blender | |
| parent | 7760e97c6bf5e8b09f99ba8b5ec17db6eb95acf5 (diff) | |
Proxy enable operator:
* Enable operator for proxies now becomes set operator for selected and
can unset-set all options.
* Properties become read-only labels, only use operator to set proxies.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 0fd3a4dd4aa..a05cbfffb9f 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -3414,30 +3414,43 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) 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 turnon = true; if (ed == NULL || !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) { - return OPERATOR_FINISHED; + turnon = false; } SEQP_BEGIN(ed, seq) { if ((seq->flag & SELECT)) { if (seq->type == SEQ_TYPE_MOVIE) { - if (!seq->strip->proxy) { - BKE_sequencer_proxy_set(seq, true); - } + BKE_sequencer_proxy_set(seq, turnon); if (proxy_25) seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_25; + else + seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_25; + if (proxy_50) seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_50; + else + seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_50; + if (proxy_75) seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_75; + else + seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_75; + if (proxy_100) seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_100; + else + seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_100; + if (!override) seq->strip->proxy->build_flags |= SEQ_PROXY_SKIP_EXISTING; + else + seq->strip->proxy->build_flags &= ~SEQ_PROXY_SKIP_EXISTING; } } } @@ -3451,7 +3464,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_enable_proxies(wmOperatorType *ot) { /* identifiers */ - ot->name = "Enable Proxies"; + ot->name = "Set Selected Strip Proxies"; ot->idname = "SEQUENCER_OT_enable_proxies"; ot->description = "Enable selected proxies on all selected Movie strips"; |