diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-25 07:32:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-25 09:45:47 +0300 |
commit | 5572986aad22811af9e3c34992fdd40251c106ab (patch) | |
tree | 08ff6acecce33cd0e81b744c5125a2fefc1507f6 /source/blender | |
parent | 2626a6fca25113b54fca20b4f2cc906a9ed6d5f8 (diff) |
Cleanup: rename mesh looptri/tessface functions
Use consistent terminology.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_editmesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editmesh_bvh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 12 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_hook.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
14 files changed, 36 insertions, 34 deletions
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index 6e4132cbc35..c4f02dea5c7 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -79,7 +79,7 @@ typedef struct BMEditMesh { } BMEditMesh; /* editmesh.c */ -void BKE_editmesh_tessface_calc(BMEditMesh *em); +void BKE_editmesh_looptri_calc(BMEditMesh *em); BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate); BMEditMesh *BKE_editmesh_copy(BMEditMesh *em); BMEditMesh *BKE_editmesh_from_object(struct Object *ob); diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index ef897755985..cfbece9457e 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -537,14 +537,14 @@ void BKE_mesh_tangent_loops_to_tessdata(struct CustomData *fdata, unsigned int (*loopindices)[4], const int num_faces, const char *layer_name); -int BKE_mesh_recalc_tessellation(struct CustomData *fdata, - struct CustomData *ldata, - struct CustomData *pdata, - struct MVert *mvert, - int totface, - int totloop, - int totpoly, - const bool do_face_nor_copy); +int BKE_mesh_tessface_calc_ex(struct CustomData *fdata, + struct CustomData *ldata, + struct CustomData *pdata, + struct MVert *mvert, + int totface, + int totloop, + int totpoly, + const bool do_face_nor_copy); void BKE_mesh_recalc_looptri(const struct MLoop *mloop, const struct MPoly *mpoly, const struct MVert *mvert, diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 4f4aeab721b..866c494d354 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -39,7 +39,7 @@ BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate) em->bm = bm; if (do_tessellate) { - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); } return em; @@ -126,7 +126,7 @@ static void editmesh_tessface_calc_intern(BMEditMesh *em) BM_mesh_calc_tessellation(em->bm, em->looptris, &em->tottri); } -void BKE_editmesh_tessface_calc(BMEditMesh *em) +void BKE_editmesh_looptri_calc(BMEditMesh *em) { editmesh_tessface_calc_intern(em); diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index f23276d7be0..5af4e4c0023 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -73,7 +73,7 @@ BMBVHTree *BKE_bmbvh_new_ex(BMesh *bm, BMFace *f_test, *f_test_prev; bool test_fn_ret; - /* BKE_editmesh_tessface_calc() must be called already */ + /* BKE_editmesh_looptri_calc() must be called already */ BLI_assert(looptris_tot != 0 || bm->totface == 0); if (cos_cage) { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 6102fec963e..68dfc263d3e 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1438,7 +1438,7 @@ void BKE_mesh_ensure_navmesh(Mesh *me) void BKE_mesh_tessface_calc(Mesh *mesh) { - mesh->totface = BKE_mesh_recalc_tessellation( + mesh->totface = BKE_mesh_tessface_calc_ex( &mesh->fdata, &mesh->ldata, &mesh->pdata, diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 7430bc14858..38762109167 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -2945,14 +2945,14 @@ void BKE_mesh_tangent_loops_to_tessdata(CustomData *fdata, * * \return number of tessellation faces. */ -int BKE_mesh_recalc_tessellation(CustomData *fdata, - CustomData *ldata, - CustomData *pdata, - MVert *mvert, - int totface, - int totloop, - int totpoly, - const bool do_face_nor_copy) +int BKE_mesh_tessface_calc_ex(CustomData *fdata, + CustomData *ldata, + CustomData *pdata, + MVert *mvert, + int totface, + int totloop, + int totpoly, + const bool do_face_nor_copy) { /* use this to avoid locking pthread for _every_ polygon * and calling the fill function */ diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index 71cc20c78b7..ae808b85323 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -235,7 +235,7 @@ static bool poly_gset_compare_fn(const void *k1, const void *k2) * but the additional checks are costly and not necessary in the case of mirror, * because each vertex is only merged to its own mirror. * - * \note #BKE_mesh_recalc_tessellation has to run on the returned DM + * \note #BKE_mesh_tessface_calc_ex has to run on the returned DM * if you want to access tessfaces. */ Mesh *BKE_mesh_merge_verts(Mesh *mesh, diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 949c16ff26a..233a8161020 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -105,7 +105,9 @@ bool EDBM_vert_color_check(struct BMEditMesh *em); bool EDBM_mesh_hide(struct BMEditMesh *em, bool swap); bool EDBM_mesh_reveal(struct BMEditMesh *em, bool select); -void EDBM_update_generic(struct BMEditMesh *em, const bool do_tessface, const bool is_destructive); +void EDBM_update_generic(struct BMEditMesh *em, + const bool do_tessellation, + const bool is_destructive); struct UvElementMap *BM_uv_element_map_create(struct BMesh *bm, const bool selected, diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 748de60abc9..522c2f32d27 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -85,7 +85,7 @@ void EDBM_redo_state_restore(BMBackup backup, BMEditMesh *em, int recalctess) tmpbm = NULL; if (recalctess) { - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); } } @@ -105,7 +105,7 @@ void EDBM_redo_state_free(BMBackup *backup, BMEditMesh *em, int recalctess) backup->bmcopy = NULL; if (recalctess && em) { - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); } } @@ -162,7 +162,7 @@ bool EDBM_op_finish(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const bool /* when copying, tessellation isn't to for faster copying, * but means we need to re-tessellate here */ if (em->looptris == NULL) { - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); } if (em->ob) { @@ -1389,15 +1389,15 @@ void EDBM_stats_update(BMEditMesh *em) /* so many tools call these that we better make it a generic function. */ -void EDBM_update_generic(BMEditMesh *em, const bool do_tessface, const bool is_destructive) +void EDBM_update_generic(BMEditMesh *em, const bool do_tessellation, const bool is_destructive) { Object *ob = em->ob; /* order of calling isn't important */ DEG_id_tag_update(ob->data, ID_RECALC_GEOMETRY); WM_main_add_notifier(NC_GEOM | ND_DATA, ob->data); - if (do_tessface) { - BKE_editmesh_tessface_calc(em); + if (do_tessellation) { + BKE_editmesh_looptri_calc(em); } if (is_destructive) { diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 12f7ecb89dd..0c2b5292716 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -594,7 +594,7 @@ bool ED_object_editmode_enter_ex(Main *bmain, Scene *scene, Object *ob, int flag if (LIKELY(em)) { /* order doesn't matter */ EDBM_mesh_normals_update(em); - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); } WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_MESH, NULL); diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 1576dc3bbb8..bcbf7ddf9a6 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -352,7 +352,7 @@ static bool object_hook_index_array(Main *bmain, em = me->edit_mesh; EDBM_mesh_normals_update(em); - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); /* check selected vertices first */ if (return_editmesh_indexar(em, r_tot, r_indexar, r_cent) == 0) { diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 739f05e0b67..67364f275dd 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -149,7 +149,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) em = me->edit_mesh; EDBM_mesh_normals_update(em); - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); /* Make sure the evaluated mesh is updated. * diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 9c564bcfa54..41eb5f1e812 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -901,7 +901,7 @@ static void recalcData_objects(TransInfo *t) DEG_id_tag_update(tc->obedit->data, 0); /* sets recalc flags */ BMEditMesh *em = BKE_editmesh_from_object(tc->obedit); EDBM_mesh_normals_update(em); - BKE_editmesh_tessface_calc(em); + BKE_editmesh_looptri_calc(em); } } else if (t->obedit_type == OB_ARMATURE) { /* no recalc flag, does pose */ diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index e43fe912fc3..d605aa6b4f7 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -403,7 +403,7 @@ static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr) DEG_id_tag_update(ob->data, 0); EDBM_mesh_normals_update(((Mesh *)ob->data)->edit_mesh); - BKE_editmesh_tessface_calc(((Mesh *)ob->data)->edit_mesh); + BKE_editmesh_looptri_calc(((Mesh *)ob->data)->edit_mesh); break; case OB_CURVE: case OB_SURF: |