[Bf-blender-cvs] [cda894f] master: Fix T38229: 3D view shadeless display not supported with GLSL, so hide in UI.

[Brecht Van Lommel]

Commit: cda894fcfd6a19f48eeb745af49800b5165f936c
Author: Brecht Van Lommel
Date:   Tue Jan 21 15:49:03 2014 +0100
https://developer.blender.org/rBcda894fcfd6a19f48eeb745af49800b5165f936c

Fix T38229: 3D view shadeless display not supported with GLSL, so hide in UI.

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

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 825bf51..cc264ea 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2839,14 +2839,15 @@ class VIEW3D_PT_view3d_shading(Panel):
 
         if not scene.render.use_shading_nodes:
             col.prop(gs, "material_mode", text="")
-            col.prop(view, "show_textured_solid")
 
         if view.viewport_shade == 'SOLID':
+            col.prop(view, "show_textured_solid")
             col.prop(view, "use_matcap")
             if view.use_matcap:
                 col.template_icon_view(view, "matcap_icon")
         elif view.viewport_shade == 'TEXTURED':
-            col.prop(view, "show_textured_shadeless")
+            if scene.render.use_shading_nodes or gs.material_mode != 'GLSL':
+                col.prop(view, "show_textured_shadeless")
 
         col.prop(view, "show_backface_culling")
         if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}: