[Bf-blender-cvs] [23688ec39a7] blender2.8: Fix T58794: extended shading pie menu wrong order in lookdev mode.

[Brecht Van Lommel]

Commit: 23688ec39a78b671f47174e63e58628e29488177
Author: Brecht Van Lommel
Date:   Wed Dec 5 15:19:52 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB23688ec39a78b671f47174e63e58628e29488177

Fix T58794: extended shading pie menu wrong order in lookdev mode.

===================================================================

M	release/scripts/addons_contrib
M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5c4210d5b78..41d528d76b9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5c4210d5b78c61137c5f32e7deb7561177ac0894
+Subproject commit 41d528d76b99e689e09915f5dcd589480579ef3a
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index ccacff00992..e0f72e81096 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3888,41 +3888,28 @@ class VIEW3D_MT_shading_ex_pie(Menu):
         pie.prop_enum(view.shading, "type", value='WIREFRAME')
         pie.prop_enum(view.shading, "type", value='SOLID')
 
-        xray_active = (
-            (context.mode in {'POSE', 'EDIT_MESH'}) or
-            (view.shading.type in {'SOLID', 'WIREFRAME'})
-        )
-        if xray_active:
-            sub = pie
-        else:
-            sub = pie.row()
-            sub.active = False
-
-        if False:
-            sub.operator("view3d.toggle_xray", text="Toggle X-Ray", icon='XRAY')
+        # Note this duplicates 'view3d.toggle_xray' logic, so we can see the active item: T58661.
+        if (
+                (context.mode == 'POSE') or
+                ((context.mode == 'WEIGHT_PAINT') and (context.active_object.find_armature()))
+        ):
+            pie.prop(view.overlay, "show_xray_bone", icon='XRAY')
         else:
-            # XXX, duplicate 'view3d.toggle_xray' logic, so we can see the active item: T58661.
-            if (
-                    (context.mode == 'POSE') or
-                    ((context.mode == 'WEIGHT_PAINT') and (context.active_object.find_armature()))
-            ):
-                pie.prop(view.overlay, "show_bone_select", icon='XRAY')
+            xray_active = (
+                (context.mode == 'EDIT_MESH') or
+                (view.shading.type in {'SOLID', 'WIREFRAME'})
+            )
+            if xray_active:
+                sub = pie
             else:
-                xray_active = (
-                    (context.mode == 'EDIT_MESH') or
-                    (view.shading.type in {'SOLID', 'WIREFRAME'})
-                )
-                if xray_active:
-                    sub = pie
-                else:
-                    sub = pie.row()
-                    sub.active = False
-                sub.prop(
-                    view.shading,
-                    "show_xray_wireframe" if (view.shading.type == 'WIREFRAME') else "show_xray",
-                    text="Toggle X-Ray",
-                    icon='XRAY',
-                )
+                sub = pie.row()
+                sub.active = False
+            sub.prop(
+                view.shading,
+                "show_xray_wireframe" if (view.shading.type == 'WIREFRAME') else "show_xray",
+                text="Toggle X-Ray",
+                icon='XRAY',
+            )
 
         pie.prop(view.overlay, "show_overlays", text="Toggle Overlays", icon='OVERLAY')