[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44378] trunk/blender/source/blender: fix [#30318] increase/decrease selection won't work (select-more/less)

[Campbell Barton]

Revision: 44378
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44378
Author:   campbellbarton
Date:     2012-02-23 15:22:29 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
fix [#30318] increase/decrease selection won't work (select-more/less)

This was a problem with bmesh merge, now it works as expected again.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_utils.c
    trunk/blender/source/blender/editors/mesh/bmesh_utils.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c	2012-02-23 15:10:26 UTC (rev 44377)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c	2012-02-23 15:22:29 UTC (rev 44378)
@@ -194,10 +194,6 @@
 
 			if (e) {
 				BMO_elem_flag_enable(bm, v, SEL_FLAG);
-
-				BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) {
-					BMO_elem_flag_enable(bm, e, SEL_FLAG);
-				}
 			}
 		}
 	}

Modified: trunk/blender/source/blender/editors/mesh/bmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_utils.c	2012-02-23 15:10:26 UTC (rev 44377)
+++ trunk/blender/source/blender/editors/mesh/bmesh_utils.c	2012-02-23 15:22:29 UTC (rev 44378)
@@ -415,7 +415,7 @@
 	int use_faces = em->selectmode > SCE_SELECT_EDGE;
 
 	BMO_op_initf(em->bm, &bmop,
-	             "regionextend geom=%hvef constrict=%i use_faces=%b",
+	             "regionextend geom=%hvef constrict=%b use_faces=%b",
 	             BM_ELEM_SELECT, FALSE, use_faces);
 	BMO_op_exec(em->bm, &bmop);
 	BMO_slot_buffer_hflag_enable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL);
@@ -430,10 +430,10 @@
 	int use_faces = em->selectmode > SCE_SELECT_EDGE;
 
 	BMO_op_initf(em->bm, &bmop,
-	             "regionextend geom=%hvef constrict=%i use_faces=%b",
-	             BM_ELEM_SELECT, FALSE, use_faces);
+	             "regionextend geom=%hvef constrict=%b use_faces=%b",
+	             BM_ELEM_SELECT, TRUE, use_faces);
 	BMO_op_exec(em->bm, &bmop);
-	BMO_slot_buffer_hflag_enable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL);
+	BMO_slot_buffer_hflag_disable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL);
 	BMO_op_finish(em->bm, &bmop);
 
 	EDBM_selectmode_flush(em);