blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

View3D: Shading Popup 

- layout so cavity options are better visible
- fixed issues showing wrong options in Material mode
- added labels + seperators
This commit is contained in:
Jeroen Bakker 2018-06-06 15:44:00 +02:00
parent 89042f576e
commit fcf720a135
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3492,7 +3492,7 @@ class VIEW3D_PT_shading(Panel):
shading = view.shading
col = layout.column()
col.row().label("Lighting")
if shading.type in ('SOLID', 'TEXTURED'):
col.row().prop(shading, "light", expand=True)
if shading.light == 'STUDIO':
@ -3504,44 +3504,49 @@ class VIEW3D_PT_shading(Panel):
col.row().template_icon_view(shading, "matcap")
if shading.type == 'SOLID':
col.separator()
col.row().label("Color")
col.row().prop(shading, "color_type", expand=True)
if shading.color_type == 'SINGLE':
col.row().prop(shading, "single_color", text="")
if not(shading.type == 'SOLID' and shading.light == 'MATCAP'):
row = col.row()
row.prop(shading, "show_specular_highlight")
if shading.type in ('SOLID', 'TEXTURED'):
row = col.row()
row.prop(shading, "show_xray")
sub = row.row()
sub.active = shading.show_xray
sub.prop(shading, "xray_alpha", text="")
col.separator()
row = col.row()
row.active = not shading.show_xray
row.prop(shading, "show_shadows")
sub = row.row()
sub.active = shading.show_shadows and not shading.show_xray
sub.prop(shading, "shadow_intensity", text="")
if not shading.light == 'MATCAP':
row = col.row()
row.prop(shading, "show_specular_highlight")
row = col.row()
row.active = not shading.show_xray
row.prop(shading, "show_cavity")
sub = row.column()
sub.active = not shading.show_xray and shading.show_cavity
sub.prop(shading, "cavity_ridge_factor")
sub.prop(shading, "cavity_valley_factor")
if shading.type in ('SOLID', 'TEXTURED'):
row = col.split(0.4)
row.prop(shading, "show_xray")
sub = row.row()
sub.active = shading.show_xray
sub.prop(shading, "xray_alpha", text="")
row = col.row()
row.prop(shading, "show_object_outline")
sub = row.row()
sub.active = shading.show_object_outline
sub.prop(shading, "object_outline_color", text="")
row = col.split(0.4)
row.active = not shading.show_xray
row.prop(shading, "show_shadows")
sub = row.row()
sub.active = shading.show_shadows and not shading.show_xray
sub.prop(shading, "shadow_intensity", text="")
col.prop(view, "show_world")
row = col.split(0.4)
row.active = not shading.show_xray
row.prop(shading, "show_cavity")
sub = row.column()
sub.active = not shading.show_xray and shading.show_cavity
sub.prop(shading, "cavity_ridge_factor")
sub.prop(shading, "cavity_valley_factor")
row = col.split(0.4)
row.prop(shading, "show_object_outline")
sub = row.row()
sub.active = shading.show_object_outline
sub.prop(shading, "object_outline_color", text="")
col.prop(view, "show_world")
elif shading.type in ('MATERIAL'):
col.row().template_icon_view(shading, "studio_light")