Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2010-04-11 23:26:46 +0400
committerPeter Schlaile <peter@schlaile.de>2010-04-11 23:26:46 +0400
commit978609aa44659bbf4565ad413f5242654249fb22 (patch)
treed46f7735d2916be9d5a25867235058b981745b03 /release/scripts/ui/space_sequencer.py
parenta6b8ac5452790d65b3941f579b6ee21f8693e497 (diff)
== Sequencer ==
Made custom proxy files a lot more sensible to select (upgraded to filepath get/setters) Changed semantics, since custom files don't make much sense without custom directories...
Diffstat (limited to 'release/scripts/ui/space_sequencer.py')
-rw-r--r--release/scripts/ui/space_sequencer.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index 57909bbb260..8cf6a021be6 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -727,9 +727,12 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel):
flow = layout.column_flow()
flow.prop(strip, "proxy_custom_directory")
+ flow.prop(strip, "proxy_custom_file")
if strip.proxy: # TODO - need to add this somehow
- flow.prop(strip.proxy, "directory")
- flow.prop(strip.proxy, "file")
+ if strip.proxy_custom_directory and not strip.proxy_custom_file:
+ flow.prop(strip.proxy, "directory")
+ if strip.proxy_custom_file:
+ flow.prop(strip.proxy, "filepath")
class SEQUENCER_PT_view(SequencerButtonsPanel_Output):