[Bf-blender-cvs] [18252e407f2] blender2.8: Viewport: tweak shading pie layout and naming.

[Brecht Van Lommel]

Commit: 18252e407f2cb6dc705e223cecf688e5eb823f42
Author: Brecht Van Lommel
Date:   Fri Sep 21 17:55:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB18252e407f2cb6dc705e223cecf688e5eb823f42

Viewport: tweak shading pie layout and naming.

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 068276f44c6..85191454ee0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3801,7 +3801,8 @@ class VIEW3D_MT_shading_pie(Menu):
 
         view = context.space_data
 
-        pie.prop(view.shading, "type", expand=True)
+        pie.prop_enum(view.shading, "type", value='WIREFRAME')
+        pie.prop_enum(view.shading, "type", value='SOLID')
 
         if context.mode == 'POSE':
             pie.prop(view.overlay, "show_bone_select", icon='ORTHO')
@@ -3815,9 +3816,11 @@ class VIEW3D_MT_shading_pie(Menu):
                 sub = pie.row()
                 sub.active = False
 
-            sub.prop(view.shading, "show_xray", icon='ORTHO')
+            sub.prop(view.shading, "show_xray", text="Toggle X-Ray", icon='ORTHO')
 
-        pie.prop(view.overlay, "show_overlays", icon='OVERLAY')
+        pie.prop(view.overlay, "show_overlays", text="Toggle Overlays", icon='OVERLAY')
+        pie.prop_enum(view.shading, "type", value='MATERIAL')
+        pie.prop_enum(view.shading, "type", value='RENDERED')
 
 
 # ********** Panel **********
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index f80145aec98..6991587b710 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2543,7 +2543,7 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "show_xray", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_SHADING_XRAY);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "X-Ray", "Show whole scene transparent");
+	RNA_def_property_ui_text(prop, "Show X-Ray", "Show whole scene transparent");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 	prop = RNA_def_property(srna, "xray_alpha", PROP_FLOAT, PROP_FACTOR);