2.5 3DView Header:

* Sculpt Menu is now written in python.
* Select Menus are only for Object, Edit and Particle Mode, added code to check on that, fixed Console warnings.

* Fixed a typo in armature buttons, reported in IRC by "ebrain".

1 files changed, 42 insertions, 1 deletions

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 796c04dafbe..20c949889e0 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -21,11 +21,14 @@ class VIEW3D_HT_header(bpy.types.Header):
 			row.itemM("VIEW3D_MT_view")
 			
 			# Select Menu
-			if mode_string not in ('EDIT_TEXT', ):
+			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
+				# XXX: Particle Mode has Select Menu.
 				row.itemM("VIEW3D_MT_select_%s" % mode_string)
 			
 			if mode_string == 'OBJECT':
 				row.itemM("VIEW3D_MT_object")
+			elif mode_string == 'SCULPT':
+				row.itemM("VIEW3D_MT_sculpt")
 
 		layout.template_header_3D()
 
@@ -461,6 +464,42 @@ class VIEW3D_MT_object_show(bpy.types.Menu):
 		layout.itemO("object.restrictview_set")
 		layout.item_booleanO("object.restrictview_set", "unselected", True, text="Hide Unselected")
 
+# ********** Sculpt menu **********	
+	
+class VIEW3D_MT_sculpt(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Sculpt"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		sculpt = context.tool_settings.sculpt
+		brush = context.tool_settings.sculpt.brush
+		
+		layout.itemR(sculpt, "symmetry_x")
+		layout.itemR(sculpt, "symmetry_y")
+		layout.itemR(sculpt, "symmetry_z")
+		layout.itemS()
+		layout.itemR(sculpt, "lock_x")
+		layout.itemR(sculpt, "lock_y")
+		layout.itemR(sculpt, "lock_z")
+		layout.itemS()
+		layout.item_menu_enumO("brush.curve_preset", property="shape")
+		layout.itemS()
+		
+		if brush.sculpt_tool != 'GRAB':
+			layout.itemR(brush, "airbrush")
+			
+			if brush.sculpt_tool != 'LAYER':
+				layout.itemR(brush, "anchored")
+			
+			if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
+				layout.itemR(brush, "flip_direction")
+
+			if brush.sculpt_tool == 'LAYER':
+				layout.itemR(brush, "persistent")
+				layout.itemO("sculpt.set_persistent_base")
+
 # ********** Panel **********
 
 class VIEW3D_PT_3dview_properties(bpy.types.Panel):
@@ -589,6 +628,8 @@ bpy.types.register(VIEW3D_MT_object_group)
 bpy.types.register(VIEW3D_MT_object_constraints)
 bpy.types.register(VIEW3D_MT_object_show)
 
+bpy.types.register(VIEW3D_MT_sculpt) # Sculpt Menu
+
 bpy.types.register(VIEW3D_PT_3dview_properties) # Panels
 bpy.types.register(VIEW3D_PT_3dview_display)
 bpy.types.register(VIEW3D_PT_background_image)