diff options
author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-04-12 01:02:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-12 01:08:28 +0300 |
commit | d032c5e46cd54011e42fad8dac28b57c06c5b500 (patch) | |
tree | ed00f4854fcd7197e206f472a315d989c8758a8b /intern | |
parent | 665467e51eb4af3203418568a597cec0eed47d79 (diff) |
Cycles microdisplacement: UI tweak to use split column
Reviewed By: brecht, dingto
Differential Revision: https://developer.blender.org/D1917
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 17 | ||||
-rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 951b03e483a..c02e2497d93 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(align=True) + 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" diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 24c2c57082f..a590b5f5532 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -782,7 +782,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob, if(b_mesh) { if(render_layer.use_surfaces && !hide_tris) { - if(cmesh.data && experimental && RNA_enum_get(&cmesh, "use_subdivision")) + if(cmesh.data && experimental && RNA_enum_get(&cmesh, "subdivision_type")) create_subd_mesh(scene, mesh, b_ob, b_mesh, &cmesh, used_shaders); else create_mesh(scene, mesh, b_mesh, used_shaders); |