[Bf-blender-cvs] [e0ae23b] master: Allow editing of active strip proxy settings again in addition to the set operator

Sergey Sharybin noreply at git.blender.org
Tue Apr 21 12:00:41 CEST 2015


Commit: e0ae23b4d69be4ac78cde50b37cbbaed87a39ea4
Author: Sergey Sharybin
Date:   Tue Apr 21 11:57:31 2015 +0200
Branches: master
https://developer.blender.org/rBe0ae23b4d69be4ac78cde50b37cbbaed87a39ea4

Allow editing of active strip proxy settings again in addition to the
set operator

===================================================================

M	release/scripts/startup/bl_ui/space_sequencer.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 4bb65ff..3aed000 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")




More information about the Bf-blender-cvs mailing list