blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cancel edge-rip macro if no changes are made.

This commit is contained in:
Campbell Barton 2014-09-10 16:20:08 +10:00
parent 652eaf7723
commit 6480fdcae4
Notes: blender-bot 2023-02-14 10:03:38 +01:00 
Referenced by issue #41923, uv map resets when joining objects
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/mesh/editmesh_rip_edge.c
View File

@ -63,6 +63,7 @@ static int edbm_rip_edge_invoke(bContext *C, wmOperator *UNUSED(op), const wmEve
const float mval_fl[2] = {UNPACK2(event->mval)};
float cent_sco[2];
int cent_tot;
bool changed = false;
/* mouse direction to view center */
float mval_dir[2];
@ -211,17 +212,24 @@ found_edge:
BM_edge_select_set(bm, e_best, true);
}
BM_elem_flag_enable(v_new, BM_ELEM_TAG); /* prevent further splitting */
changed = true;
}
}
}
BM_select_history_clear(bm);
if (changed) {
BM_select_history_clear(bm);
BM_mesh_select_mode_flush(bm);
BM_mesh_select_mode_flush(bm);
EDBM_update_generic(em, true, true);
EDBM_update_generic(em, true, true);
return OPERATOR_FINISHED;
return OPERATOR_FINISHED;
}
else {
return OPERATOR_CANCELLED;
}
}