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

Cleanup: remove BMeshToMeshParams.calc_tessface 

This wasn't used, tessface is being phased out.
Caller can run explicitly if needed.
This commit is contained in:
Campbell Barton 2018-02-19 17:41:37 +11:00
parent 05f3e245a8
commit 860939ccc2
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_mesh_conv.c
View File

@ -808,11 +808,7 @@ void BM_mesh_bm_to_me(
if (vertMap) MEM_freeN(vertMap);
}
if (params->calc_tessface) {
BKE_mesh_tessface_calc(me);
}
BKE_mesh_update_customdata_pointers(me, params->calc_tessface);
BKE_mesh_update_customdata_pointers(me, false);
{
BMEditSelection *selected;

1
source/blender/bmesh/intern/bmesh_mesh_conv.h
View File

@ -55,7 +55,6 @@ void BM_mesh_bm_from_me(
ATTR_NONNULL(1, 3);
struct BMeshToMeshParams {
uint calc_tessface : 1;
/** Update object hook indices & vertex parents. */
uint calc_object_remap : 1;
int64_t cd_mask_extra;

1
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@ -843,7 +843,6 @@ static BMOpDefine bmo_bmesh_to_mesh_def = {
{"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}},
/* pointer to an object structure */
{"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}},
{"skip_tessface", BMO_OP_SLOT_BOOL}, /* don't calculate mfaces */
{{'\0'}},
},
{{{'\0'}}}, /* no output */

6
source/blender/bmesh/operators/bmo_mesh_conv.c
View File

@ -62,20 +62,18 @@ void bmo_object_load_bmesh_exec(BMesh *bm, BMOperator *op)
Mesh *me = ob->data;
BMO_op_callf(bm, op->flag,
"bmesh_to_mesh mesh=%p object=%p skip_tessface=%b",
me, ob, true);
"bmesh_to_mesh mesh=%p object=%p",
me, ob);
}
void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op)
{
Mesh *me = BMO_slot_ptr_get(op->slots_in, "mesh");
/* Object *ob = BMO_slot_ptr_get(op, "object"); */
const bool dotess = !BMO_slot_bool_get(op->slots_in, "skip_tessface");
BM_mesh_bm_to_me(
bm, me,
(&(struct BMeshToMeshParams){
.calc_tessface = dotess,
.calc_object_remap = true,
}));
}