svn merge ^/trunk/blender -r46979:47003

2012-05-25 09:42:58 +00:00
parent 139c92e7eb 19dd66cf3b
commit 5ed2e0d5bc
30 changed files with 419 additions and 165 deletions
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2391,6 +2391,8 @@ class VIEW3D_PT_view3d_display(Panel):
            col.prop(gs, "material_mode", text="")
            col.prop(view, "show_textured_solid")

+        col.prop(view, "show_backface_culling")            
+
        layout.separator()

        region = view.region_quadview