[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57618] trunk/blender: move sort from vert /edge/face into mesh menu only (sorting isn't such a common operation).

[Campbell Barton]

Revision: 57618
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57618
Author:   campbellbarton
Date:     2013-06-20 19:09:18 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
move sort from vert/edge/face into mesh menu only (sorting isn't such a common operation).
correct own recently added assert.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/blenlib/intern/BLI_heap.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-06-20 18:23:12 UTC (rev 57617)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-06-20 19:09:18 UTC (rev 57618)
@@ -1800,9 +1800,7 @@
         layout.menu("VIEW3D_MT_uv_map", text="UV Unwrap...")
 
         layout.separator()
-        layout.operator("mesh.symmetrize")
-        layout.operator("mesh.symmetry_snap")
-        layout.separator()
+
         layout.operator("mesh.duplicate_move")
         layout.menu("VIEW3D_MT_edit_mesh_extrude")
         layout.menu("VIEW3D_MT_edit_mesh_delete")
@@ -1816,6 +1814,12 @@
 
         layout.separator()
 
+        layout.operator("mesh.symmetrize")
+        layout.operator("mesh.symmetry_snap")
+        layout.operator_menu_enum("mesh.sort_elements", "type", text="Sort Elements...")
+
+        layout.separator()
+
         layout.prop(toolsettings, "use_mesh_automerge")
         layout.prop_menu_enum(toolsettings, "proportional_edit")
         layout.prop_menu_enum(toolsettings, "proportional_edit_falloff")
@@ -1871,6 +1875,7 @@
         layout.operator("mesh.shortest_path_select")
         layout.operator("mesh.sort_elements")
         layout.operator("mesh.symmetrize")
+        layout.operator("mesh.symmetry_snap")
 
 
 class VIEW3D_MT_edit_mesh_select_mode(Menu):
@@ -1939,7 +1944,6 @@
         layout.operator("mesh.bevel").vertex_only = True
         layout.operator("mesh.vertices_smooth")
         layout.operator("mesh.remove_doubles")
-        layout.operator("mesh.sort_elements", text="Sort Vertices").elements = {'VERT'}
 
         layout.operator("mesh.blend_from_shape")
 
@@ -1996,7 +2000,6 @@
         layout.operator("mesh.bevel").vertex_only = False
         layout.operator("mesh.edge_split")
         layout.operator("mesh.bridge_edge_loops")
-        layout.operator("mesh.sort_elements", text="Sort Edges").elements = {'EDGE'}
 
         layout.separator()
 
@@ -2026,7 +2029,6 @@
         layout.operator("mesh.bevel").vertex_only = False
         layout.operator("mesh.solidify")
         layout.operator("mesh.wireframe")
-        layout.operator("mesh.sort_elements", text="Sort Faces").elements = {'FACE'}
 
         layout.separator()
 

Modified: trunk/blender/source/blender/blenlib/intern/BLI_heap.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_heap.c	2013-06-20 18:23:12 UTC (rev 57617)
+++ trunk/blender/source/blender/blenlib/intern/BLI_heap.c	2013-06-20 19:09:18 UTC (rev 57618)
@@ -208,7 +208,7 @@
 {
 	void *ptr = heap->tree[0]->ptr;
 
-	BLI_assert(heap->size == 0);
+	BLI_assert(heap->size != 0);
 
 	heap->tree[0]->ptr = heap->freenodes;
 	heap->freenodes = heap->tree[0];