blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

UI: tweak shading popover 

Show backface culling option even with rendered shading since it doesn't
yet support meshes two-sided option (noted as TODO).

Also correct bad string comparison.
This commit is contained in:
Campbell Barton 2018-12-19 11:23:21 +11:00
parent a72220ecf0
commit d760a6ed54
Notes: blender-bot 2023-02-14 11:28:39 +01:00 
Referenced by issue #58070, The Backface Culling option should move from Overlays to Shading
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,10 @@ class VIEW3D_HT_header(Header):
row = layout.row(align=True)
row.prop(shading, "type", text="", expand=True)
sub = row.row(align=True)
sub.enabled = shading.type != 'RENDERED'
# TODO, currently render shading type ignores mesh two-side, until it's supported
# show the shading popover which shows double-sided option.
# sub.enabled = shading.type != 'RENDERED'
sub.popover(panel="VIEW3D_PT_shading")
@ -4509,11 +4512,6 @@ class VIEW3D_PT_shading_options(Panel):
bl_label = "Options"
bl_parent_id = 'VIEW3D_PT_shading'
@classmethod
def poll(cls, context):
shading = VIEW3D_PT_shading.get_shading(context)
return shading.type in {'WIREFRAME', 'SOLID'}
def draw(self, context):
layout = self.layout
@ -4521,6 +4519,9 @@ class VIEW3D_PT_shading_options(Panel):
col = layout.column()
if shading.type != 'WIREFRAME':
col.prop(shading, "show_backface_culling")
row = col.row()
if shading.type == 'WIREFRAME':
@ -4548,8 +4549,6 @@ class VIEW3D_PT_shading_options(Panel):
col = layout.column()
col.prop(shading, "show_backface_culling")
row = col.row()
row.active = not shading.show_xray
row.prop(shading, "show_cavity")
@ -4574,15 +4573,16 @@ class VIEW3D_PT_shading_options(Panel):
sub.prop(shading, "curvature_ridge_factor", text="Ridge")
sub.prop(shading, "curvature_valley_factor", text="Valley")
row = layout.split()
row.prop(shading, "show_object_outline")
sub = row.row()
sub.active = shading.show_object_outline
sub.prop(shading, "object_outline_color", text="")
if shading.type in {'WIREFRAME', 'SOLID'}:
row = layout.split()
row.prop(shading, "show_object_outline")
sub = row.row()
sub.active = shading.show_object_outline
sub.prop(shading, "object_outline_color", text="")
col = layout.column()
if (shading.light == 'STUDIO') and (shading.type is not 'WIREFRAME'):
col.prop(shading, "show_specular_highlight", text="Specular Lighting")
col = layout.column()
if (shading.light == 'STUDIO') and (shading.type != 'WIREFRAME'):
col.prop(shading, "show_specular_highlight", text="Specular Lighting")
class VIEW3D_PT_shading_options_shadow(Panel):