[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47873] trunk/blender/intern/cycles/ blender/addon/ui.py: Cyles UI:

Thomas Dinges blender at dingto.org
Thu Jun 14 10:58:26 CEST 2012


Revision: 47873
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47873
Author:   dingto
Date:     2012-06-14 08:58:23 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
Cyles UI:
* Alignment fix for the "Samples" panel, this way both columns are aligned nicely. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-06-14 08:53:37 UTC (rev 47872)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-06-14 08:58:23 UTC (rev 47873)
@@ -57,7 +57,7 @@
         split = layout.split()
 
         col = split.column()
-        sub = col.column(align=True)
+        sub = col.column()
         sub.active = cscene.device == 'CPU'
         sub.prop(cscene, "progressive")
 
@@ -66,23 +66,24 @@
         sub.prop(cscene, "sample_clamp")
 
         if cscene.progressive or cscene.device != 'CPU':
-            col = split.column(align=True)
+            col = split.column()
             col.label(text="Samples:")
-            col.prop(cscene, "samples", text="Render")
-            col.prop(cscene, "preview_samples", text="Preview")
+            sub = col.column(align=True)
+            sub.prop(cscene, "samples", text="Render")
+            sub.prop(cscene, "preview_samples", text="Preview")
         else:
-            sub = col.column(align=True)
             sub.label(text="AA Samples:")
             sub.prop(cscene, "aa_samples", text="Render")
             sub.prop(cscene, "preview_aa_samples", text="Preview")
 
-            col = split.column(align=True)
+            col = split.column()
             col.label(text="Samples:")
-            col.prop(cscene, "diffuse_samples", text="Diffuse")
-            col.prop(cscene, "glossy_samples", text="Glossy")
-            col.prop(cscene, "transmission_samples", text="Transmission")
-            col.prop(cscene, "ao_samples", text="AO")
-            col.prop(cscene, "mesh_light_samples", text="Mesh Light")
+            sub = col.column(align=True)
+            sub.prop(cscene, "diffuse_samples", text="Diffuse")
+            sub.prop(cscene, "glossy_samples", text="Glossy")
+            sub.prop(cscene, "transmission_samples", text="Transmission")
+            sub.prop(cscene, "ao_samples", text="AO")
+            sub.prop(cscene, "mesh_light_samples", text="Mesh Light")
 
 class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
     bl_label = "Light Paths"




More information about the Bf-blender-cvs mailing list