[Bf-blender-cvs] [fcf720a1352] blender2.8: View3D: Shading Popup
Jeroen Bakker
noreply at git.blender.org
Wed Jun 6 15:45:12 CEST 2018
Commit: fcf720a13526485cea2a073dcde2f45db25b847b
Author: Jeroen Bakker
Date: Wed Jun 6 15:44:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfcf720a13526485cea2a073dcde2f45db25b847b
View3D: Shading Popup
- layout so cavity options are better visible
- fixed issues showing wrong options in Material mode
- added labels + seperators
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 149f93245df..03446254a89 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -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="")
-
- 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="")
-
- 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")
-
- 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="")
+ col.separator()
- col.prop(view, "show_world")
+ 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()
+ 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")
More information about the Bf-blender-cvs
mailing list