[Bf-blender-cvs] [1daf5e8] temp-cycles-microdisplacement: Change Cycles displacement UI to split column

[Mai Lavelle]

Commit: 1daf5e80c3f2d38c4bf1e212d4dda68e9f9e8c3e
Author: Mai Lavelle
Date:   Tue Dec 1 08:16:00 2015 -0500
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB1daf5e80c3f2d38c4bf1e212d4dda68e9f9e8c3e

Change Cycles displacement UI to split column

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

M	intern/cycles/blender/addon/ui.py

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 951b03e..f4b49ba 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -681,10 +681,21 @@ class Cycles_PT_mesh_displacement(CyclesButtonsPanel, Panel):
         elif mball:
             cdata = mball.cycles
 
-        layout.prop(cdata, "displacement_method", text="Method")
-        layout.prop(cdata, "subdivision_type", text="Subdivision")
-        layout.prop(cdata, "dicing_rate")
+        split = layout.split()
+
+        col = split.column()
+        sub = col.column()
+        sub.label(text="Displacment:")
+        sub.prop(cdata, "displacement_method", text="")
+
+        col = split.column()
+        sub = col.column(align=True)
+        sub.label(text="Subdivision:")
+        sub.prop(cdata, "subdivision_type", text="")
 
+        if cdata.subdivision_type != 'NONE':
+            sub.label(text="Subdivision Rate:")
+            sub.prop(cdata, "dicing_rate", text="Render")
 
 class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
     bl_label = "Motion Blur"