diff --git a/source/blender/bmesh/intern/bmesh_marking.cc b/source/blender/bmesh/intern/bmesh_marking.cc index 264f3a41d66..f484195fda0 100644 --- a/source/blender/bmesh/intern/bmesh_marking.cc +++ b/source/blender/bmesh/intern/bmesh_marking.cc @@ -439,7 +439,7 @@ void BM_mesh_select_mode_flush(BMesh *bm) /** \} */ -void BM_mesh_select_flush(BMesh *bm, const bool select) +void BM_mesh_select_flush_from_verts(BMesh *bm, const bool select) { if (select) { BMEdge *e; diff --git a/source/blender/bmesh/intern/bmesh_marking.hh b/source/blender/bmesh/intern/bmesh_marking.hh index ed8aa1cabce..8e8600b1f39 100644 --- a/source/blender/bmesh/intern/bmesh_marking.hh +++ b/source/blender/bmesh/intern/bmesh_marking.hh @@ -108,12 +108,12 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, short selectmode, eBMSelectionFlush void BM_mesh_select_mode_flush(BMesh *bm); /** - * Mode independent selection/de-selection flush. + * Mode independent selection/de-selection flush from vertices. * * \param select: When true, flush the selection state to de-selected elements, * otherwise perform the opposite, flushing de-selection. */ -void BM_mesh_select_flush(BMesh *bm, bool select); +void BM_mesh_select_flush_from_verts(BMesh *bm, bool select); int BM_mesh_elem_hflag_count_enabled(BMesh *bm, char htype, char hflag, bool respecthide); int BM_mesh_elem_hflag_count_disabled(BMesh *bm, char htype, char hflag, bool respecthide); diff --git a/source/blender/bmesh/operators/bmo_subdivide.cc b/source/blender/bmesh/operators/bmo_subdivide.cc index 4d463a3a15f..bab38b9eb03 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.cc +++ b/source/blender/bmesh/operators/bmo_subdivide.cc @@ -1362,7 +1362,7 @@ void BM_mesh_esubdivide(BMesh *bm, if (edge_hflag & BM_ELEM_SELECT) { BMO_slot_buffer_hflag_enable( bm, op.slots_out, "geom_inner.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true); - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } break; } diff --git a/source/blender/editors/include/ED_mesh.hh b/source/blender/editors/include/ED_mesh.hh index 7d53f0864e8..101e79aaf3e 100644 --- a/source/blender/editors/include/ED_mesh.hh +++ b/source/blender/editors/include/ED_mesh.hh @@ -137,12 +137,12 @@ void EDBM_selectmode_flush_ex(BMEditMesh *em, short selectmode); void EDBM_selectmode_flush(BMEditMesh *em); /** - * Mode independent selection/de-selection flush. + * Mode independent selection/de-selection flush from vertices. * * \param select: When true, flush the selection state to de-selected elements, * otherwise perform the opposite, flushing de-selection. */ -void EDBM_select_flush(BMEditMesh *em, bool select); +void EDBM_select_flush_from_verts(BMEditMesh *em, bool select); bool EDBM_vert_color_check(BMEditMesh *em); diff --git a/source/blender/editors/include/ED_uvedit.hh b/source/blender/editors/include/ED_uvedit.hh index 09690b786aa..86c2cab7250 100644 --- a/source/blender/editors/include/ED_uvedit.hh +++ b/source/blender/editors/include/ED_uvedit.hh @@ -220,12 +220,12 @@ void ED_uvedit_sticky_selectmode_update(bContext *C); void ED_uvedit_selectmode_flush(const Scene *scene, BMesh *bm); /** - * Mode independent UV selection/de-selection flush. + * Mode independent UV selection/de-selection flush from vertices. * * \param select: When true, flush the selection state to de-selected elements, * otherwise perform the opposite, flushing de-selection. */ -void uvedit_select_flush(const Scene *scene, BMesh *bm, bool select); +void uvedit_select_flush_from_verts(const Scene *scene, BMesh *bm, bool select); bool ED_uvedit_nearest_uv_multi(const View2D *v2d, const Scene *scene, diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index 9778de9d3c3..6f3b5aeb134 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -2470,7 +2470,7 @@ void EDBM_selectmode_set(BMEditMesh *em, const short selectmode) if (em->selectmode & SCE_SELECT_VERTEX) { if (em->bm->totvertsel) { - EDBM_select_flush(em, true); + EDBM_select_flush_from_verts(em, true); } } else if (em->selectmode & SCE_SELECT_EDGE) { @@ -2585,7 +2585,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, } } /* Deselect edges without both verts selected. */ - BM_mesh_select_flush(bm, false); + BM_mesh_select_flush_from_verts(bm, false); } } else if (selectmode_old == SCE_SELECT_FACE) { @@ -2601,7 +2601,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, } } /* Deselect faces without edges selected. */ - BM_mesh_select_flush(bm, false); + BM_mesh_select_flush_from_verts(bm, false); } else if (selectmode_new == SCE_SELECT_VERTEX) { /* Flush down (face -> vert). */ @@ -2612,7 +2612,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, } } /* Deselect faces without verts selected. */ - BM_mesh_select_flush(bm, false); + BM_mesh_select_flush_from_verts(bm, false); } } } @@ -5349,11 +5349,11 @@ static wmOperatorStatus edbm_select_random_exec(bContext *C, wmOperator *op) } if (select) { - /* Was #EDBM_select_flush, but it over selects in edge/face mode. */ + /* Was #EDBM_select_flush_from_verts, but it over selects in edge/face mode. */ EDBM_selectmode_flush(em); } else { - EDBM_select_flush(em, false); + EDBM_select_flush_from_verts(em, false); } DEG_id_tag_update(static_cast(obedit->data), ID_RECALC_SELECT); diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index fde5123dd78..920683fe195 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -1832,7 +1832,7 @@ static bool edbm_edge_split_selected_edges(wmOperator *op, Object *obedit, BMEdi BM_custom_loop_normals_from_vector_layer(em->bm, false); - EDBM_select_flush(em, true); + EDBM_select_flush_from_verts(em, true); EDBMUpdate_Params params{}; params.calc_looptris = true; params.calc_normals = false; @@ -1907,7 +1907,7 @@ static bool edbm_edge_split_selected_verts(wmOperator *op, Object *obedit, BMEdi BM_custom_loop_normals_from_vector_layer(em->bm, false); - EDBM_select_flush(em, true); + EDBM_select_flush_from_verts(em, true); EDBMUpdate_Params params{}; params.calc_looptris = true; params.calc_normals = false; @@ -6289,7 +6289,7 @@ static wmOperatorStatus edbm_dissolve_degenerate_exec(bContext *C, wmOperator *o } /* tricky to maintain correct selection here, so just flush up from verts */ - EDBM_select_flush(em, true); + EDBM_select_flush_from_verts(em, true); EDBMUpdate_Params params{}; params.calc_looptris = true; diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc index 48a36bfb9c8..a5bfdf3d914 100644 --- a/source/blender/editors/mesh/editmesh_utils.cc +++ b/source/blender/editors/mesh/editmesh_utils.cc @@ -381,11 +381,11 @@ void EDBM_selectmode_flush(BMEditMesh *em) EDBM_selectmode_flush_ex(em, em->selectmode); } -void EDBM_select_flush(BMEditMesh *em, const bool select) +void EDBM_select_flush_from_verts(BMEditMesh *em, const bool select) { /* Function below doesn't use. just do this to keep the values in sync. */ em->bm->selectmode = em->selectmode; - BM_mesh_select_flush(em->bm, select); + BM_mesh_select_flush_from_verts(em->bm, select); } void EDBM_select_more(BMEditMesh *em, const bool use_face_step) diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc index 05a034b013e..7f1498a4e1f 100644 --- a/source/blender/editors/object/object_hook.cc +++ b/source/blender/editors/object/object_hook.cc @@ -152,7 +152,7 @@ static void select_editbmesh_hook(Object *ob, HookModifierData *hmd) nr++; } - EDBM_select_flush(em, true); + EDBM_select_flush_from_verts(em, true); } static int return_editlattice_indexar(Lattice *editlatt, diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index f23cc30505d..1900463e9e7 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -1153,7 +1153,7 @@ static void vgroup_select_verts(const ToolSettings &tool_settings, /* This has to be called, because this function operates on vertices only. * Vertices to edges/faces. */ - EDBM_select_flush(em, select); + EDBM_select_flush_from_verts(em, select); } } else { diff --git a/source/blender/editors/uvedit/uvedit_rip.cc b/source/blender/editors/uvedit/uvedit_rip.cc index 4872e453fce..194f6304aec 100644 --- a/source/blender/editors/uvedit/uvedit_rip.cc +++ b/source/blender/editors/uvedit/uvedit_rip.cc @@ -884,7 +884,7 @@ static bool uv_rip_object(Scene *scene, Object *obedit, const float co[2], const } } if (changed) { - uvedit_select_flush(scene, bm, false); + uvedit_select_flush_from_verts(scene, bm, false); } return changed; } diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index 45dfb2c047e..e24ba3f64be 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -212,14 +212,14 @@ void ED_uvedit_select_sync_flush(const ToolSettings *ts, BMesh *bm, const bool s if (ts->uv_flag & UV_FLAG_SYNC_SELECT) { if (ts->selectmode != SCE_SELECT_FACE) { if (select == false) { - BM_mesh_select_flush(bm, false); + BM_mesh_select_flush_from_verts(bm, false); } else { if (ts->selectmode & SCE_SELECT_VERTEX) { - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } else { - /* Use instead of #BM_mesh_select_flush so selecting edges doesn't + /* Use instead of #BM_mesh_select_flush_from_verts so selecting edges doesn't * flush vertex to face selection, see: #117320. */ BM_mesh_select_mode_flush(bm); } @@ -1404,7 +1404,7 @@ void ED_uvedit_selectmode_flush(const Scene *scene, BMesh *bm) /** \name UV Flush selection (up/down) * \{ */ -void uvedit_select_flush(const Scene *scene, BMesh *bm, const bool select) +void uvedit_select_flush_from_verts(const Scene *scene, BMesh *bm, const bool select) { const ToolSettings *ts = scene->toolsettings; BLI_assert((ts->uv_flag & UV_FLAG_SYNC_SELECT) == 0); @@ -2141,7 +2141,7 @@ static void uv_select_linked_multi(Scene *scene, if (uv_sync_select) { if (deselect) { - BM_mesh_select_flush(bm, false); + BM_mesh_select_flush_from_verts(bm, false); } else { if (!select_faces) { @@ -2329,7 +2329,7 @@ static wmOperatorStatus uv_select_more_less(bContext *C, const bool select) /* Select tagged loops. */ uv_select_flush_from_tag_loop(scene, obedit, select); /* Set/unset edge flags based on selected verts. */ - uvedit_select_flush(scene, bm, select); + uvedit_select_flush_from_verts(scene, bm, select); } DEG_id_tag_update(static_cast(obedit->data), ID_RECALC_SELECT); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); @@ -2505,7 +2505,7 @@ static void uv_select_invert(const Scene *scene, BMEditMesh *em) uv_select_flush_from_loop_edge_flag(scene, bm); } else { - uvedit_select_flush(scene, bm, true); + uvedit_select_flush_from_verts(scene, bm, true); } } @@ -2981,10 +2981,10 @@ static wmOperatorStatus uv_mouse_select_loop_generic_multi(bContext *C, if (ts->uv_flag & UV_FLAG_SYNC_SELECT) { if (flush == 1) { - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } else if (flush == -1) { - BM_mesh_select_flush(bm, false); + BM_mesh_select_flush_from_verts(bm, false); } } else { @@ -5063,10 +5063,10 @@ static wmOperatorStatus uv_select_similar_vert_exec(bContext *C, wmOperator *op) } if (changed) { if (ts->uv_flag & UV_FLAG_SYNC_SELECT) { - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } else { - uvedit_select_flush(scene, bm, true); + uvedit_select_flush_from_verts(scene, bm, true); } uv_select_tag_update_for_object(depsgraph, ts, ob); } @@ -5180,10 +5180,10 @@ static wmOperatorStatus uv_select_similar_edge_exec(bContext *C, wmOperator *op) } if (changed) { if (ts->uv_flag & UV_FLAG_SYNC_SELECT) { - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } else { - uvedit_select_flush(scene, bm, true); + uvedit_select_flush_from_verts(scene, bm, true); } uv_select_tag_update_for_object(depsgraph, ts, ob); } @@ -5287,10 +5287,10 @@ static wmOperatorStatus uv_select_similar_face_exec(bContext *C, wmOperator *op) } if (changed) { if (ts->uv_flag & UV_FLAG_SYNC_SELECT) { - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } else { - uvedit_select_flush(scene, bm, true); + uvedit_select_flush_from_verts(scene, bm, true); } uv_select_tag_update_for_object(depsgraph, ts, ob); } @@ -5390,10 +5390,10 @@ static wmOperatorStatus uv_select_similar_island_exec(bContext *C, wmOperator *o if (changed) { if (ts->uv_flag & UV_FLAG_SYNC_SELECT) { - BM_mesh_select_flush(bm, true); + BM_mesh_select_flush_from_verts(bm, true); } else { - uvedit_select_flush(scene, bm, true); + uvedit_select_flush_from_verts(scene, bm, true); } uv_select_tag_update_for_object(depsgraph, ts, obedit); } diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index 27f61ae1da4..6a37c0c06e1 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -1452,7 +1452,7 @@ PyDoc_STRVAR( bpy_bmesh_select_flush_doc, ".. method:: select_flush(select)\n" "\n" - " Flush selection, independent of the current selection mode.\n" + " Flush selection from vertices, independent of the current selection mode.\n" "\n" " :arg select: flush selection or de-selected elements.\n" " :type select: bool\n"); @@ -1465,7 +1465,7 @@ static PyObject *bpy_bmesh_select_flush(BPy_BMesh *self, PyObject *value) if ((param = PyC_Long_AsBool(value)) == -1) { return nullptr; } - BM_mesh_select_flush(self->bm, param); + BM_mesh_select_flush_from_verts(self->bm, param); Py_RETURN_NONE; }