[Bf-blender-cvs] [f6b902a9caf] blender2.8: Follow up to MESH_OT_offset_edge_loops
Dalai Felinto
noreply at git.blender.org
Fri Aug 31 22:24:07 CEST 2018
Commit: f6b902a9caf3aa05185ea0d0cc4163355629aa39
Author: Dalai Felinto
Date: Fri Aug 31 17:23:33 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBf6b902a9caf3aa05185ea0d0cc4163355629aa39
Follow up to MESH_OT_offset_edge_loops
Committing this as a separate commit since we may want to keep this mode syncing
elsewhere. But for now it makes sense to do it like this.
===================================================================
M source/blender/editors/mesh/editmesh_tools.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index c6c011cc436..f7ea8532335 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -6466,9 +6466,17 @@ void MESH_OT_wireframe(wmOperatorType *ot)
static int edbm_offset_edgeloop_exec(bContext *C, wmOperator *op)
{
+ bool mode_change = false;
const bool use_cap_endpoint = RNA_boolean_get(op->ptr, "use_cap_endpoint");
int ret = OPERATOR_CANCELLED;
+ Object *obedit = CTX_data_edit_object(C);
+ BMEditMesh *em_edit = BKE_editmesh_from_object(obedit);
+ if (em_edit->selectmode == SCE_SELECT_FACE) {
+ EDBM_selectmode_to_scene(C);
+ mode_change = true;
+ }
+
ViewLayer *view_layer = CTX_data_view_layer(C);
uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
@@ -6476,6 +6484,16 @@ static int edbm_offset_edgeloop_exec(bContext *C, wmOperator *op)
Object *obedit = objects[ob_index];
BMEditMesh *em = BKE_editmesh_from_object(obedit);
+ /** If in face-only select mode, switch to edge select mode so that
+ * an edge-only selection is not inconsistent state.
+ *
+ * We need to run this for all objects, even when nothing is selected.
+ * This way we keep them in sync. */
+ if (mode_change) {
+ em->selectmode = SCE_SELECT_EDGE;
+ EDBM_selectmode_set(em);
+ }
+
if (em->bm->totedgesel == 0) {
continue;
}
@@ -6490,14 +6508,6 @@ static int edbm_offset_edgeloop_exec(bContext *C, wmOperator *op)
BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
- /* If in face-only select mode, switch to edge select mode so that
- * an edge-only selection is not inconsistent state */
- if (em->selectmode == SCE_SELECT_FACE) {
- em->selectmode = SCE_SELECT_EDGE;
- EDBM_selectmode_set(em);
- EDBM_selectmode_to_scene(C);
- }
-
BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
if (!EDBM_op_finish(em, &bmop, op, true)) {
More information about the Bf-blender-cvs
mailing list