Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 81c98740652..5423eb7f5e0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4658,10 +4658,12 @@ class VIEW3D_PT_shading_options(Panel):
sub = row.row()
sub.active = shading.show_xray
sub.prop(shading, "xray_alpha", text="X-Ray")
+ #X-ray mode is off when alpha is 1.0
+ xray_active = shading.show_xray and shading.xray_alpha != 1
row = col.row()
row.prop(shading, "show_shadows", text="")
- row.active = not shading.show_xray
+ row.active = not xray_active
sub = row.row(align=True)
sub.active = shading.show_shadows
sub.prop(shading, "shadow_intensity", text="Shadow")
@@ -4674,10 +4676,10 @@ class VIEW3D_PT_shading_options(Panel):
col = layout.column()
row = col.row()
- row.active = not shading.show_xray
+ row.active = not xray_active
row.prop(shading, "show_cavity")
- if shading.show_cavity and not shading.show_xray:
+ if shading.show_cavity and not xray_active:
row.prop(shading, "cavity_type", text="Type")
if shading.cavity_type in {'WORLD', 'BOTH'}:
@@ -4698,7 +4700,7 @@ class VIEW3D_PT_shading_options(Panel):
sub.prop(shading, "curvature_valley_factor", text="Valley")
row = col.row()
- row.active = not shading.show_xray
+ row.active = not xray_active
row.prop(shading, "use_dof", text="Depth Of Field")
if shading.type in {'WIREFRAME', 'SOLID'}: