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:
authorAntony Riakiotakis <kalast@gmail.com>2015-03-26 17:44:51 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-03-26 17:44:51 +0300
commitd084967627c5d568c87c616cead4f468d9a21887 (patch)
treed16bea961f5b8271b6fe1b5114f3d48bf5d8296d /release/scripts/startup
parentc0ef4e9b788b8db433bf3e92bd19ee00f86f9866 (diff)
Revert "Change Enables proxy operator to Copy proxy operator."
This reverts commit ec03ab021f171bf529746bb440756fbc986b45e7. Changing this since it looks like Mattieu does not really like the change. Will be adding another way to tweak the directories
Diffstat (limited to 'release/scripts/startup')
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py26
1 files changed, 18 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index feaef352978..4f83cc03b10 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -926,14 +926,24 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
flow.prop(proxy, "directory")
if proxy.use_proxy_custom_file:
flow.prop(proxy, "filepath")
-
+
layout.label("Enabled Proxies:")
- col = layout.column()
- col.prop(proxy, "build_25")
- col.prop(proxy, "build_50")
- col.prop(proxy, "build_75")
- col.prop(proxy, "build_100")
- col.prop(proxy, "use_overwrite")
+ enabled = ""
+ row = layout.row()
+ if (proxy.build_25):
+ enabled += "25% "
+ if (proxy.build_50):
+ enabled += "50% "
+ if (proxy.build_75):
+ enabled += "75% "
+ if (proxy.build_100):
+ enabled += "100% "
+
+ row.label(enabled)
+ if (proxy.use_overwrite):
+ layout.label("Overwrite On")
+ else:
+ layout.label("Overwrite Off")
col = layout.column()
col.label(text="Build JPEG quality")
@@ -946,7 +956,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
col.prop(proxy, "timecode")
col = layout.column()
- col.operator("sequencer.copy_proxy_settings")
+ col.operator("sequencer.enable_proxies")
col.operator("sequencer.rebuild_proxy")