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

ShadingMenu: Splitted in SubPanels

This commit is contained in:
Jeroen Bakker 2018-06-18 08:15:29 +02:00
parent b2f0803b5b
commit 79546a4eb6
1 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3603,6 +3603,20 @@ class VIEW3D_PT_shading(Panel):
bl_region_type = 'HEADER'
bl_label = "Shading"
@classmethod
def poll(cls, context):
return True
def draw(self, context):
pass
class VIEW3D_PT_shading_lighting(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
bl_label = "Lighting"
bl_parent_id = 'VIEW3D_PT_shading'
@classmethod
def poll(cls, context):
return True
@ -3613,82 +3627,112 @@ class VIEW3D_PT_shading(Panel):
view = context.space_data
shading = view.shading
col = layout.column()
col.row().label("Lighting")
if shading.type in ('SOLID', 'TEXTURED'):
col.row().prop(shading, "light", expand=True)
layout.row().prop(shading, "light", expand=True)
if shading.light == 'STUDIO':
row = col.row()
row = layout.row()
row.template_icon_view(shading, "studio_light")
sub = row.column()
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
if shading.selected_studio_light.orientation == 'WORLD':
col.row().prop(shading, "studiolight_rot_z")
layout.row().prop(shading, "studiolight_rot_z")
elif shading.light == 'MATCAP':
row = col.row()
row = layout.row()
row.template_icon_view(shading, "studio_light")
sub = row.column()
sub.operator('VIEW3D_OT_toggle_matcap_flip', emboss=False, text="", icon='ARROW_LEFTRIGHT')
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
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 shading.type in ('SOLID', 'TEXTURED'):
col.separator()
if not shading.light == 'MATCAP':
row = col.row()
row.prop(shading, "show_specular_highlight")
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.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="")
row = col.split(0.4)
row.active = not shading.show_xray
row.prop(shading, "show_cavity")
sub = row.column(align=True)
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")
row = col.split(0.4)
row.active = not shading.show_xray
row.prop(shading, "show_anti_aliasing")
elif shading.type in ('MATERIAL'):
row = col.row()
row = layout.row()
row.template_icon_view(shading, "studio_light")
sub = row.column()
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
if shading.selected_studio_light.orientation == 'WORLD':
col.row().prop(shading, "studiolight_rot_z")
col.row().prop(shading, "studiolight_background")
col.prop(shading, "use_scene_light")
layout.row().prop(shading, "studiolight_rot_z")
layout.row().prop(shading, "studiolight_background")
layout.prop(shading, "use_scene_light")
class VIEW3D_PT_shading_color(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
bl_label = "Color"
bl_parent_id = 'VIEW3D_PT_shading'
@classmethod
def poll(cls, context):
view = context.space_data
shading = view.shading
return shading.type in ['SOLID']
def draw(self, context):
layout = self.layout
view = context.space_data
shading = view.shading
layout.row().prop(shading, "color_type", expand=True)
if shading.color_type == 'SINGLE':
layout.row().prop(shading, "single_color", text="")
class VIEW3D_PT_shading_options(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
bl_label = "Options"
bl_parent_id = 'VIEW3D_PT_shading'
@classmethod
def poll(cls, context):
view = context.space_data
shading = view.shading
return shading.type in ['SOLID', 'TEXTURED']
def draw(self, context):
layout = self.layout
view = context.space_data
shading = view.shading
if not shading.light == 'MATCAP':
row = layout.row()
row.prop(shading, "show_specular_highlight")
if shading.type in ('SOLID', 'TEXTURED'):
row = layout.split(0.4)
row.prop(shading, "show_xray")
sub = row.row()
sub.active = shading.show_xray
sub.prop(shading, "xray_alpha", text="")
row = layout.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="")
row = layout.split(0.4)
row.active = not shading.show_xray
row.prop(shading, "show_cavity")
sub = row.column(align=True)
sub.active = not shading.show_xray and shading.show_cavity
sub.prop(shading, "cavity_ridge_factor")
sub.prop(shading, "cavity_valley_factor")
row = layout.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="")
layout.prop(view, "show_world")
row = layout.split(0.4)
row.active = not shading.show_xray
row.prop(shading, "show_anti_aliasing")
class VIEW3D_PT_overlay(Panel):
@ -4252,6 +4296,9 @@ classes = (
VIEW3D_PT_quad_view,
VIEW3D_PT_view3d_stereo,
VIEW3D_PT_shading,
VIEW3D_PT_shading_lighting,
VIEW3D_PT_shading_color,
VIEW3D_PT_shading_options,
VIEW3D_PT_overlay,
VIEW3D_PT_overlay_edit_mesh,
VIEW3D_PT_overlay_edit_curve,