VSE: Simplify proxy settings

- Remove Full Render size from VSE preview size. Use just 100% instead.
- Add Use Proxies checkbox to control whether proxies are used globally
- Move preview size to top so it is most prominent
- Set default to 100% preview size and use proxies

Reviewed By: sergey, fsiddi

Differential Revision: https://developer.blender.org/D10362

1 files changed, 4 insertions, 3 deletions

diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c
index 22d8daba696..562cd07ddee 100644
--- a/source/blender/sequencer/intern/proxy.c
+++ b/source/blender/sequencer/intern/proxy.c
@@ -199,11 +199,12 @@ static bool seq_proxy_get_fname(Editing *ed,
   return true;
 }
 
-bool SEQ_can_use_proxy(Sequence *seq, int psize)
+bool SEQ_can_use_proxy(const struct SeqRenderData *context, Sequence *seq, int psize)
 {
-  if (seq->strip->proxy == NULL) {
+  if (seq->strip->proxy == NULL || !context->use_proxies) {
     return false;
   }
+
   short size_flags = seq->strip->proxy->build_size_flags;
   return (seq->flag & SEQ_USE_PROXY) != 0 && psize != IMB_PROXY_NONE && (size_flags & psize) != 0;
 }
@@ -217,7 +218,7 @@ ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int timeline
   StripAnim *sanim;
 
   /* only use proxies, if they are enabled (even if present!) */
-  if (!SEQ_can_use_proxy(seq, SEQ_rendersize_to_proxysize(psize))) {
+  if (!SEQ_can_use_proxy(context, seq, SEQ_rendersize_to_proxysize(psize))) {
     return NULL;
   }