Commit: b611bdb6298b0fb94c90b35c9aed35ba82ad6544
Author: Campbell Barton
Date: Sat Oct 31 19:26:11 2015 +1100
Branches: blender-v2.76-release
https://developer.blender.org/rBb611bdb6298b0fb94c90b35c9aed35ba82ad6544
Revert "Fix T46494: Can't de-select a face w/ mixed modes"
This reverts commit 381501ab45d63abb1502656c35e01adce36e7e34.
===================================================================
M source/blender/bmesh/intern/bmesh_marking.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_marking.c
b/source/blender/bmesh/intern/bmesh_marking.c
index cd3c832..17b6d1d 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -102,7 +102,6 @@ static bool bm_vert_is_edge_select_any(const BMVert *v)
}
#endif
-#if 0
static bool bm_edge_is_face_select_any_other(BMLoop *l_first)
{
const BMLoop *l_iter = l_first;
@@ -115,7 +114,6 @@ static bool bm_edge_is_face_select_any_other(BMLoop
*l_first)
}
return false;
}
-#endif
#if 0
static bool bm_edge_is_face_select_any(const BMEdge *e)
@@ -500,20 +498,6 @@ void BM_face_select_set(BMesh *bm, BMFace *f, const bool
select)
BM_elem_flag_disable(f, BM_ELEM_SELECT);
bm->totfacesel -= 1;
}
- /**
- * \note This allows a temporarily invalid state - where for eg
- * an edge bay be de-selected, but an adjacent face remains
selected.
- *
- * Rely on #BM_mesh_select_mode_flush to correct these cases.
- */
-#if 1
- l_iter = l_first = BM_FACE_FIRST_LOOP(f);
- do {
- BM_vert_select_set(bm, l_iter->v, false);
- BM_edge_select_set(bm, l_iter->e, false);
- } while ((l_iter = l_iter->next) != l_first);
-#else
- /* disabled, see T46494 */
/* flush down to edges */
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
@@ -531,7 +515,6 @@ void BM_face_select_set(BMesh *bm, BMFace *f, const bool
select)
BM_vert_select_set(bm, l_iter->v, false);
}
} while ((l_iter = l_iter->next) != l_first);
-#endif
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
