diff options
| author | Alexander Pinzon <apinzonf@gmail.com> | 2013-10-15 21:55:57 +0400 |
|---|---|---|
| committer | Alexander Pinzon <apinzonf@gmail.com> | 2013-10-15 21:55:57 +0400 |
| commit | 7bfd0aae833a4596b7e570c055a6603175d89fd1 (patch) | |
| tree | e0d7174e9e33fdff4c5dbde64d241a201001dd0c /release/scripts/startup/bl_ui/space_view3d.py | |
| parent | f8336067925b4688b5c1c26fc8153b8fe8824056 (diff) | |
| parent | cd6477eee008146c81f7963e52563277ed0b2eac (diff) | |
svn merge ^/trunk/blender 60616:60786
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index f71f8351c60..83fbd1a8d70 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2634,10 +2634,14 @@ 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, "use_matcap") if view.use_matcap: col.template_icon_view(view, "matcap_icon") + elif view.viewport_shade == 'TEXTURED': + 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'}: col.prop(view, "show_occlude_wire") |