[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56434] trunk/blender: fix for select ungrouped vertices not flushing, also group select menu items more logically.

[Campbell Barton]

Revision: 56434
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56434
Author:   campbellbarton
Date:     2013-05-01 05:59:58 +0000 (Wed, 01 May 2013)
Log Message:
-----------
fix for select ungrouped vertices not flushing, also group select menu items more logically.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/editors/mesh/editmesh_select.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-05-01 05:26:10 UTC (rev 56433)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-05-01 05:59:58 UTC (rev 56434)
@@ -582,26 +582,36 @@
 
         layout.separator()
 
+        # primitive
         layout.operator("mesh.select_all").action = 'TOGGLE'
         layout.operator("mesh.select_all", text="Inverse").action = 'INVERT'
 
         layout.separator()
 
-        layout.operator("mesh.select_ungrouped", text="Ungrouped Verts")
+        # numeric
         layout.operator("mesh.select_random", text="Random")
         layout.operator("mesh.select_nth")
+
+        layout.separator()
+
+        # geometric
         layout.operator("mesh.edges_select_sharp", text="Sharp Edges")
         layout.operator("mesh.faces_select_linked_flat", text="Linked Flat Faces")
-        layout.operator("mesh.select_interior_faces", text="Interior Faces")
-        layout.operator("mesh.select_axis", text="Side of Active")
 
         layout.separator()
 
-        layout.operator("mesh.select_face_by_sides")
+        # topology
+        layout.operator("mesh.select_loose", text="Loose Geometry")
         if context.scene.tool_settings.mesh_select_mode[2] is False:
             layout.operator("mesh.select_non_manifold", text="Non Manifold")
-        layout.operator("mesh.select_loose", text="Loose Geometry")
+        layout.operator("mesh.select_interior_faces", text="Interior Faces")
+        layout.operator("mesh.select_face_by_sides")
+
+        layout.separator()
+
+        # other ...
         layout.operator_menu_enum("mesh.select_similar", "type", text="Similar")
+        layout.operator("mesh.select_ungrouped", text="Ungrouped Verts")
 
         layout.separator()
 
@@ -611,6 +621,7 @@
         layout.separator()
 
         layout.operator("mesh.select_mirror", text="Mirror")
+        layout.operator("mesh.select_axis", text="Side of Active")
 
         layout.operator("mesh.select_linked", text="Linked")
         layout.operator("mesh.select_vertex_path", text="Vertex Path")

Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-05-01 05:26:10 UTC (rev 56433)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-05-01 05:59:58 UTC (rev 56434)
@@ -3331,12 +3331,13 @@
 		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
 			MDeformVert *dv = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
 			/* no dv or dv set with no weight */
-			if (dv == NULL || (dv && dv->dw == NULL)) {
+			if (ELEM(NULL, dv, dv->dw)) {
 				BM_vert_select_set(em->bm, eve, true);
 			}
 		}
 	}
 
+	EDBM_selectmode_flush(em);
 	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;