From c721d82f25b2cde800959711b8b4d4e501b8c819 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Jun 2013 19:09:18 +0000 Subject: [PATCH] move sort from vert/edge/face into mesh menu only (sorting isn't such a common operation). correct own recently added assert. --- release/scripts/startup/bl_ui/space_view3d.py | 14 ++++++++------ source/blender/blenlib/intern/BLI_heap.c | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index cfd8fd2080f..74f9d36db0a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1800,9 +1800,7 @@ class VIEW3D_MT_edit_mesh(Menu): 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 @@ class VIEW3D_MT_edit_mesh(Menu): 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 @@ class VIEW3D_MT_edit_mesh_specials(Menu): 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 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): 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 @@ class VIEW3D_MT_edit_mesh_edges(Menu): 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 @@ class VIEW3D_MT_edit_mesh_faces(Menu): 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() diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index 2da36377e55..c62c79b492f 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -208,7 +208,7 @@ void *BLI_heap_popmin(Heap *heap) { 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];