kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles microdisplacement: UI tweak to use split column

Browse Source 
Reviewed By: brecht, dingto

Differential Revision: https://developer.blender.org/D1917
This commit is contained in:
Mai Lavelle 2016-04-12 00:02:59 +02:00 committed by Brecht Van Lommel
parent 665467e51e
commit d032c5e46c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
intern/cycles/blender/addon/ui.py
View File

@ -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"

2
intern/cycles/blender/blender_mesh.cpp
View File

@ -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);