forked from bartvdbraak/blender
Cycles microdisplacement: UI tweak to use split column
Reviewed By: brecht, dingto Differential Revision: https://developer.blender.org/D1917
This commit is contained in:
parent
665467e51e
commit
d032c5e46c
@ -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"
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user