Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender-staging.git] / release / scripts / startup / bl_ui / space_view3d.py
index dd705f76feb82f5eccf2bb1e2a4a6195c0238511..90a49501375937cc69f34a1ed68faaadeacfd7fa 100644 (file)
@@ -277,6 +277,7 @@ class VIEW3D_MT_view(Menu):
 
         layout.operator("view3d.properties", icon='MENU_PANEL')
         layout.operator("view3d.toolshelf", icon='MENU_PANEL')
+        layout.operator("view3d.tool_properties", icon='MENU_PANEL')
 
         layout.separator()
 
@@ -2174,7 +2175,6 @@ class VIEW3D_PT_view3d_display(Panel):
         col = layout.column()
         col.label(text="Shading:")
         col.prop(gs, "material_mode", text="")
-        col.prop(view, "show_textured_solid")
 
         layout.separator()