archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rename

Browse Source 
* CDDM_calc_edges --> CDDM_calc_edges_tessface
* CDDM_calc_edges_poly --> CDDM_calc_edges
This commit is contained in:
Campbell Barton
2012-01-06 02:59:28 +00:00
parent 5c59f0d589
commit be1bc0eb98
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/BKE_cdderivedmesh.h
View File

@@ -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);

8
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -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;

2
source/blender/modifiers/intern/MOD_boolean_util.c
View File

@@ -432,7 +432,7 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh(
if (material_hash)
BLI_ghash_free(material_hash, NULL, NULL);
CDDM_calc_edges(result);
CDDM_calc_edges_tessface(result);
CDDM_tessfaces_to_faces(result); /*builds ngon faces from tess (mface) faces*/

2
source/blender/modifiers/intern/MOD_decimate.c
View File

@@ -169,7 +169,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
}
}
CDDM_calc_edges(result);
CDDM_calc_edges_tessface(result);
}
else
modifier_setError(md, "Out of memory.");

2
source/blender/modifiers/intern/MOD_explode.c
View File

@@ -951,7 +951,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd,
BLI_edgehash_free(vertpahash, NULL);
/* finalization */
CDDM_calc_edges(explode);
CDDM_calc_edges_tessface(explode);
CDDM_tessfaces_to_faces(explode);
CDDM_calc_normals_mapping(explode);

2
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@@ -306,7 +306,7 @@ static DerivedMesh *fluidsim_read_obj(const char *filename)
gzclose( gzf );
CDDM_calc_edges(dm);
CDDM_calc_edges_tessface(dm);
CDDM_apply_vert_normals(dm, (short (*)[3])normals);
MEM_freeN(normals);

2
source/blender/modifiers/intern/MOD_ocean.c
View File

@@ -348,7 +348,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd)
}
}
CDDM_calc_edges_poly(result);
CDDM_calc_edges(result);
/* add uvs */
cdlayer= CustomData_number_of_layers(&result->loopData, CD_MLOOPUV);

2
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -303,7 +303,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob,
mf->v4+=(i/totface)*totvert;
}
CDDM_calc_edges(result);
CDDM_calc_edges_tessface(result);
CDDM_calc_normals_mapping(result);
if(psys->lattice){

2
source/blender/modifiers/intern/MOD_remesh.c
View File

@@ -186,7 +186,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
CDDM_lower_num_tessfaces(result, output->curface);
MEM_freeN(output);
CDDM_calc_edges(result);
CDDM_calc_edges_tessface(result);
CDDM_calc_normals_mapping(result);
/* BMESH_TODO - create polygons */