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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-04-21 12:57:31 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-04-21 13:00:10 +0300
commite0ae23b4d69be4ac78cde50b37cbbaed87a39ea4 (patch)
tree960886c3c3fb6dd569163cdf527c3bbf66e986e2 /release
parentb82d571c85abe3e7631d2966115dcae2bb076be6 (diff)
Allow editing of active strip proxy settings again in addition to the
set operator
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py22
1 files changed, 6 insertions, 16 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 4bb65ff7869..3aed000223c 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -948,23 +948,13 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
if proxy.use_proxy_custom_file:
flow.prop(proxy, "filepath")
- layout.label("Enabled Proxies:")
- 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")
+ row.prop(strip.proxy, "build_25")
+ row.prop(strip.proxy, "build_50")
+ row.prop(strip.proxy, "build_75")
+ row.prop(strip.proxy, "build_100")
+
+ layout.prop(proxy, "use_overwrite")
col = layout.column()
col.label(text="Build JPEG quality")