[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22703] branches/blender2.5/blender/ release/ui: Moved mesh display options to the 3D view n-key area, next to other display options.

[William Reynish]

Revision: 22703
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22703
Author:   billrey
Date:     2009-08-22 13:51:26 +0200 (Sat, 22 Aug 2009)

Log Message:
-----------
Moved mesh display options to the 3D view n-key area, next to other display options. 
The DNA/RNA for these options should be changed to reflect this.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_mesh.py
    branches/blender2.5/blender/release/ui/space_view3d.py

Modified: branches/blender2.5/blender/release/ui/buttons_data_mesh.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_mesh.py	2009-08-22 10:57:07 UTC (rev 22702)
+++ branches/blender2.5/blender/release/ui/buttons_data_mesh.py	2009-08-22 11:51:26 UTC (rev 22703)
@@ -48,36 +48,6 @@
 		col.itemR(mesh, "vertex_normal_flip")
 		col.itemR(mesh, "double_sided")
 
-class DATA_PT_meshdraw(DataButtonsPanel):
-	__label__ = "Draw"
-
-	def draw(self, context):
-		layout = self.layout
-		
-		mesh = context.mesh
-		
-		layout.itemL(text="Edit Mode only, WIP")
-		
-		split = layout.split()
-		
-		col = split.column()
-		col.itemR(mesh, "draw_edges", text="Edges")
-		col.itemR(mesh, "draw_faces", text="Faces")
-		col.itemR(mesh, "draw_creases", text="Creases")
-		col.itemR(mesh, "draw_bevel_weights", text="Bevel Weights")
-		col.itemR(mesh, "draw_seams", text="Seams")
-		col.itemR(mesh, "draw_sharp", text="Sharp")
-		
-		col = split.column()
-		col.itemR(mesh, "draw_normals", text="Face Normals")
-		col.itemR(mesh, "draw_vertex_normals", text="Vertex Normals")
-		
-		col.itemS()
-		
-		col.itemR(mesh, "draw_edge_lenght")
-		col.itemR(mesh, "draw_edge_angle")
-		col.itemR(mesh, "draw_face_area")
-
 class DATA_PT_vertex_groups(DataButtonsPanel):
 	__label__ = "Vertex Groups"
 	
@@ -227,7 +197,6 @@
 
 bpy.types.register(DATA_PT_context_mesh)
 bpy.types.register(DATA_PT_normals)
-bpy.types.register(DATA_PT_meshdraw)
 bpy.types.register(DATA_PT_vertex_groups)
 bpy.types.register(DATA_PT_shape_keys)
 bpy.types.register(DATA_PT_uv_texture)

Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py	2009-08-22 10:57:07 UTC (rev 22702)
+++ branches/blender2.5/blender/release/ui/space_view3d.py	2009-08-22 11:51:26 UTC (rev 22703)
@@ -1032,6 +1032,40 @@
 		col.itemR(view, "lock_rotation")
 		col.itemR(view, "box_preview")
 		col.itemR(view, "box_clip")
+
+class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
+	__label__ = "Mesh Display"
+
+	def poll(self, context):
+		editmesh = context.mode == 'EDIT_MESH'
+		return (editmesh)
+
+	def draw(self, context):
+		layout = self.layout
+
+		mesh = context.active_object.data
+		
+		col = layout.column()
+		col.itemL(text="Overlays:")
+		col.itemR(mesh, "draw_edges", text="Edges")
+		col.itemR(mesh, "draw_faces", text="Faces")
+		col.itemR(mesh, "draw_creases", text="Creases")
+		col.itemR(mesh, "draw_bevel_weights", text="Bevel Weights")
+		col.itemR(mesh, "draw_seams", text="Seams")
+		col.itemR(mesh, "draw_sharp", text="Sharp")
+		
+		col.itemS()
+		col.itemL(text="Normals:")
+		col.itemR(mesh, "draw_normals", text="Face")
+		col.itemR(mesh, "draw_vertex_normals", text="Vertex")
+		
+		col.itemS()
+		col.itemL(text="Numerics:")
+		col.itemR(mesh, "draw_edge_lenght")
+		col.itemR(mesh, "draw_edge_angle")
+		col.itemR(mesh, "draw_face_area")
 	
 class VIEW3D_PT_background_image(bpy.types.Panel):
 	__space_type__ = 'VIEW_3D'
@@ -1129,4 +1163,5 @@
 
 bpy.types.register(VIEW3D_PT_3dview_properties) # Panels
 bpy.types.register(VIEW3D_PT_3dview_display)
+bpy.types.register(VIEW3D_PT_3dview_meshdisplay)
 bpy.types.register(VIEW3D_PT_background_image)