diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-12 22:12:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-12 22:35:42 +0300 |
commit | 930771d0cf6bf296b42849b675a1e0c52d04c003 (patch) | |
tree | f700926ade02818616a468ed144547c95d849f82 /release | |
parent | bd9005ef3b88a554c2a89e85824ed5d7a0fff33a (diff) |
Fix T46749: Texture paint & shadeless mode fails
Using shadeless did nothing in texture-paint mode.
(regression in 2.76)
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index bb0ad001c34..b28a00e068b 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3046,7 +3046,7 @@ class VIEW3D_PT_view3d_shading(Panel): col.prop(view, "use_matcap") if view.use_matcap: col.template_icon_view(view, "matcap_icon") - elif view.viewport_shade == 'TEXTURED': + if view.viewport_shade == 'TEXTURED' or context.mode == 'PAINT_TEXTURE': if scene.render.use_shading_nodes or gs.material_mode != 'GLSL': col.prop(view, "show_textured_shadeless") |