griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix error with select non-manifold when a mesh is in face-mode

Browse Source 
In multi-edit mode, the select non-manifold function would exit with
an error if any mesh was in face mode.

While in practice the mode is synced between meshes, it's possible for
them to get out of sync with multiple scenes.

Editing in the middle of a loop on all edit-objects would change their
selection based on the internal order, leaving some unhandled,
returning canceled even though changes where made.

Resolve by checking the selection mode in the operators poll function,
then ensure all edit-meshes selection modes match the active object.
This commit is contained in:
Campbell Barton
2024-10-04 17:42:45 +10:00
parent e03214f424
commit 4b6ebc9579
1 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
source/blender/editors/mesh/editmesh_select.cc
View File

@@ -73,6 +73,29 @@ using blender::float3;
using blender::Span;
using blender::Vector;
/* -------------------------------------------------------------------- */
/** \name Generic Poll Funcitons
* \{ */
static bool edbm_vert_or_edge_select_mode_poll(bContext *C)
{
Object *obedit = CTX_data_edit_object(C);
if (obedit && obedit->type == OB_MESH) {
const BMEditMesh *em = BKE_editmesh_from_object(obedit);
if (em) {
if (em->selectmode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) {
return true;
}
}
}
CTX_wm_operator_poll_msg_set(C, "An edit-mesh with vertex or edge selection mode is required");
return false;
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Select Mirror
* \{ */
@@ -2598,6 +2621,42 @@ bool EDBM_selectmode_set_multi(bContext *C, const short selectmode)
return changed;
}
/**
* Ensure all edit-meshes have the same select-mode.
*
* While this is almost always the case as the UI syncs the values when set,
* it's not guaranteed because objects can be shared across scenes and each
* scene has it's own select-mode which is applied to the object when entering edit-mode.
*
* This function should only be used when the an operation would cause errors
* when applied in the wrong selection mode.
*
* \return True when a change was made.
*/
static bool edbm_selectmode_sync_multi_ex(Span<Object *> objects)
{
if (objects.size() <= 1) {
return false;
}
bool changed = false;
BMEditMesh *em_active = BKE_editmesh_from_object(objects[0]);
for (Object *obedit : objects) {
BMEditMesh *em = BKE_editmesh_from_object(obedit);
if (em_active->selectmode == em->selectmode) {
continue;
}
em->selectmode = em_active->selectmode;
EDBM_selectmode_set(em);
changed = true;
DEG_id_tag_update(static_cast<ID *>(obedit->data), ID_RECALC_SYNC_TO_EVAL | ID_RECALC_SELECT);
WM_main_add_notifier(NC_GEOM | ND_SELECT, obedit->data);
}
return changed;
}
bool EDBM_selectmode_disable(Scene *scene,
BMEditMesh *em,
const short selectmode_disable,
@@ -4531,6 +4590,8 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
const Vector<Object *> objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
scene, view_layer, CTX_wm_view3d(C));
edbm_selectmode_sync_multi_ex(objects);
for (Object *obedit : objects) {
BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMVert *v;
@@ -4541,15 +4602,7 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
EDBM_flag_disable_all(em, BM_ELEM_SELECT);
}
/* Selects isolated verts, and edges that do not have 2 neighboring
* faces
*/
if (em->selectmode == SCE_SELECT_FACE) {
BKE_report(op->reports, RPT_ERROR, "Does not work in face selection mode");
return OPERATOR_CANCELLED;
}
/* Selects isolated verts, and edges that do not have 2 neighboring faces. */
if (use_verts) {
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
@@ -4594,7 +4647,7 @@ void MESH_OT_select_non_manifold(wmOperatorType *ot)
/* api callbacks */
ot->exec = edbm_select_non_manifold_exec;
ot->poll = ED_operator_editmesh;
ot->poll = edbm_vert_or_edge_select_mode_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;