diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-21 18:49:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-21 18:52:22 +0400 |
| commit | cda894fcfd6a19f48eeb745af49800b5165f936c (patch) | |
| tree | da1f500de259f6f5e7bbc5378a98794f7e1b87bd /release | |
| parent | 8be4c6e8f3698c4f4d118490d83024220fe50780 (diff) | |
Fix T38229: 3D view shadeless display not supported with GLSL, so hide in UI.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 825bf512071..cc264eabafd 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'}: |