[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58554] trunk/blender/source/blender/ editors/mesh/editmesh_select.c: fix [#36256] Checker Deselect, failed with de-selected active face.
Campbell Barton
ideasman42 at gmail.com
Tue Jul 23 20:49:45 CEST 2013
Revision: 58554
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58554
Author: campbellbarton
Date: 2013-07-23 18:49:44 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
fix [#36256] Checker Deselect, failed with de-selected active face.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_select.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-07-23 18:33:26 UTC (rev 58553)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-07-23 18:49:44 UTC (rev 58554)
@@ -2427,9 +2427,6 @@
static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed, BMFace **r_efa)
{
- BMVert *v;
- BMEdge *e;
- BMFace *f;
BMIter iter;
BMElem *ele;
@@ -2440,7 +2437,7 @@
EDBM_selectmode_flush(em);
ele = BM_mesh_active_elem_get(em->bm);
- if (ele) {
+ if (ele && BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
switch (ele->head.htype) {
case BM_VERT:
*r_eve = (BMVert *)ele;
@@ -2455,6 +2452,7 @@
}
if (em->selectmode & SCE_SELECT_VERTEX) {
+ BMVert *v;
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
*r_eve = v;
@@ -2463,6 +2461,7 @@
}
}
else if (em->selectmode & SCE_SELECT_EDGE) {
+ BMEdge *e;
BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
*r_eed = e;
@@ -2471,8 +2470,8 @@
}
}
else if (em->selectmode & SCE_SELECT_FACE) {
- f = BM_mesh_active_face_get(em->bm, true, false);
- if (f) {
+ BMFace *f = BM_mesh_active_face_get(em->bm, true, false);
+ if (f && BM_elem_flag_test(f, BM_ELEM_SELECT)) {
*r_efa = f;
return;
}
More information about the Bf-blender-cvs
mailing list