diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 06:59:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 06:59:28 +0400 |
| commit | be1bc0eb98b44e51e11cb96e0290a02e167268ac (patch) | |
| tree | 46ac2c2ece4ed219874e5daf339311402d312ae3 /source/blender/blenkernel | |
| parent | 5c59f0d5899d1d8b145e2997b6032a6faaea82f6 (diff) | |
rename
* CDDM_calc_edges --> CDDM_calc_edges_tessface
* CDDM_calc_edges_poly --> CDDM_calc_edges
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_cdderivedmesh.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index cd2487022de..15d1dce4e8d 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -107,11 +107,11 @@ void CDDM_calc_normals_tessface(struct DerivedMesh *dm); * this completely replaces the current edge data in the DerivedMesh * builds edges from the tesselated face data. */ -void CDDM_calc_edges(struct DerivedMesh *dm); +void CDDM_calc_edges_tessface(struct DerivedMesh *dm); -/* same as CDDM_calc_edges only makes edges from ngon faces instead of tesselation +/* same as CDDM_calc_edges_tessface only makes edges from ngon faces instead of tesselation faces*/ -void CDDM_calc_edges_poly(struct DerivedMesh *dm); +void CDDM_calc_edges(struct DerivedMesh *dm); /* reconstitute face triangulation */ void CDDM_recalc_tesselation(struct DerivedMesh *dm); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index d913457bfa0..823436afb1e 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2495,7 +2495,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap) } #endif -void CDDM_calc_edges(DerivedMesh *dm) +void CDDM_calc_edges_tessface(DerivedMesh *dm) { CDDerivedMesh *cddm = (CDDerivedMesh*)dm; CustomData edgeData; @@ -2551,8 +2551,8 @@ void CDDM_calc_edges(DerivedMesh *dm) BLI_edgehash_free(eh, NULL); } -/* warning, this uses existing edges but CDDM_calc_edges() doesn't */ -void CDDM_calc_edges_poly(DerivedMesh *dm) +/* warning, this uses existing edges but CDDM_calc_edges_tessface() doesn't */ +void CDDM_calc_edges(DerivedMesh *dm) { CDDerivedMesh *cddm = (CDDerivedMesh*)dm; CustomData edgeData; @@ -2709,7 +2709,7 @@ void CDDM_tessfaces_to_faces(DerivedMesh *dm) int i, totloop; /*ensure we have all the edges we need*/ - CDDM_calc_edges(dm); + CDDM_calc_edges_tessface(dm); /*build edge hash*/ me = cddm->medge; |