New option proxy placement, project directory.

There are two per-editor settings now, the Per-Strip setting (default)
and the Project setting.

The per strip setting basically uses the previous, per-strip options for
storing the proxies.
The project setting though will use a specified directory for -all-
proxies, or the blend file directory if no directory is given.

1 files changed, 12 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 4f83cc03b10..ce1add12f54 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -913,19 +913,25 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
 
+        sequencer = context.scene.sequence_editor
+
         strip = act_strip(context)
 
         if strip.proxy:
             proxy = strip.proxy
 
             flow = layout.column_flow()
-            flow.prop(proxy, "use_proxy_custom_directory")
-            flow.prop(proxy, "use_proxy_custom_file")
+            flow.prop(sequencer, "proxy_storage")
+            if sequencer.proxy_storage == 'PROJECT':
+                flow.prop(sequencer, "proxy_dir")
+            else:
+                flow.prop(proxy, "use_proxy_custom_directory")
+                flow.prop(proxy, "use_proxy_custom_file")
 
-            if proxy.use_proxy_custom_directory and not proxy.use_proxy_custom_file:
-                flow.prop(proxy, "directory")
-            if proxy.use_proxy_custom_file:
-                flow.prop(proxy, "filepath")
+                if proxy.use_proxy_custom_directory and not proxy.use_proxy_custom_file:
+                    flow.prop(proxy, "directory")
+                if proxy.use_proxy_custom_file:
+                    flow.prop(proxy, "filepath")
 
             layout.label("Enabled Proxies:")
             enabled = ""