blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: refactor edit-mesh copy functions into functions

This commit is contained in:
Campbell Barton 2021-07-02 12:51:44 +10:00
parent 841b2cea7b
commit 016a2707f5
1 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
source/blender/editors/mesh/editmesh_utils.c
View File

@ -115,6 +115,45 @@ void EDBM_redo_state_free(BMBackup *backup, BMEditMesh *em, int recalctess)
/** \} */
/* -------------------------------------------------------------------- */
/** \name Edit-Mesh Copy API (Internal)
* \{ */
static void edbm_op_emcopy_incref_and_ensure(BMEditMesh *em, const BMOperator *UNUSED(bmop))
{
if (em->emcopy == NULL) {
em->emcopy = BKE_editmesh_copy(em);
}
em->emcopyusers++;
}
static void edbm_op_emcopy_decref(BMEditMesh *em, const BMOperator *UNUSED(bmop))
{
em->emcopyusers--;
if (em->emcopyusers < 0) {
printf("warning: em->emcopyusers was less than zero.\n");
}
if (em->emcopyusers <= 0) {
BKE_editmesh_free(em->emcopy);
MEM_freeN(em->emcopy);
em->emcopy = NULL;
}
}
static void edbm_op_emcopy_restore_and_clear(BMEditMesh *em, const BMOperator *UNUSED(bmop))
{
BLI_assert(em->emcopy != NULL);
BMEditMesh *emcopy = em->emcopy;
EDBM_mesh_free(em);
*em = *emcopy;
MEM_freeN(emcopy);
em->emcopyusers = 0;
em->emcopy = NULL;
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name BMesh Operator (BMO) API Wrapper
* \{ */
@ -132,17 +171,18 @@ bool EDBM_op_init(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const char *
return false;
}
if (!em->emcopy) {
em->emcopy = BKE_editmesh_copy(em);
}
em->emcopyusers++;
edbm_op_emcopy_incref_and_ensure(em, bmop);
va_end(list);
return true;
}
/* returns 0 on error, 1 on success. executes and finishes a bmesh operator */
/**
* The return value:
* - False on error (the mesh must not be changed).
* - True on success, executes and finishes a #BMesh operator.
*/
bool EDBM_op_finish(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const bool do_report)
{
const char *errmsg;
@ -150,18 +190,13 @@ bool EDBM_op_finish(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const bool
BMO_op_finish(em->bm, bmop);
if (BMO_error_get(em->bm, &errmsg, NULL)) {
BMEditMesh *emcopy = em->emcopy;
BLI_assert(em->emcopy != NULL);
if (do_report) {
BKE_report(op->reports, RPT_ERROR, errmsg);
}
EDBM_mesh_free(em);
*em = *emcopy;
MEM_freeN(emcopy);
em->emcopyusers = 0;
em->emcopy = NULL;
edbm_op_emcopy_restore_and_clear(em, bmop);
/**
* Note, we could pass in the mesh, however this is an exceptional case, allow a slow lookup.
@ -189,16 +224,7 @@ bool EDBM_op_finish(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const bool
return false;
}
em->emcopyusers--;
if (em->emcopyusers < 0) {
printf("warning: em->emcopyusers was less than zero.\n");
}
if (em->emcopyusers <= 0) {
BKE_editmesh_free(em->emcopy);
MEM_freeN(em->emcopy);
em->emcopy = NULL;
}
edbm_op_emcopy_decref(em, bmop);
return true;
}
@ -217,10 +243,7 @@ bool EDBM_op_callf(BMEditMesh *em, wmOperator *op, const char *fmt, ...)
return false;
}
if (!em->emcopy) {
em->emcopy = BKE_editmesh_copy(em);
}
em->emcopyusers++;
edbm_op_emcopy_incref_and_ensure(em, &bmop);
BMO_op_exec(bm, &bmop);
@ -249,10 +272,7 @@ bool EDBM_op_call_and_selectf(BMEditMesh *em,
return false;
}
if (!em->emcopy) {
em->emcopy = BKE_editmesh_copy(em);
}
em->emcopyusers++;
edbm_op_emcopy_incref_and_ensure(em, &bmop);
BMO_op_exec(bm, &bmop);
@ -284,10 +304,7 @@ bool EDBM_op_call_silentf(BMEditMesh *em, const char *fmt, ...)
return false;
}
if (!em->emcopy) {
em->emcopy = BKE_editmesh_copy(em);
}
em->emcopyusers++;
edbm_op_emcopy_incref_and_ensure(em, &bmop);
BMO_op_exec(bm, &bmop);