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

rename CDDM_calc_normals() --> CDDM_calc_normals_mapping

Browse Source
This commit is contained in:
Campbell Barton
2012-01-06 00:12:24 +00:00
parent 2b2c1007f6
commit ded0af482b
23 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ void CDDM_apply_vert_normals(struct DerivedMesh *cddm, short (*vertNormals)[3]);
/* recalculates vertex and face normals for a CDDerivedMesh
*/
void CDDM_calc_normals(struct DerivedMesh *dm);
void CDDM_calc_normals_mapping(struct DerivedMesh *dm);
/* calculates edges for a CDDerivedMesh (from face data)
* this completely replaces the current edge data in the DerivedMesh

24
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -700,7 +700,7 @@ DerivedMesh *mesh_create_derived(Mesh *me, Object *ob, float (*vertCos)[3])
if (vertCos)
CDDM_apply_vert_coords(dm, vertCos);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
return dm;
}
@@ -817,7 +817,7 @@ static DerivedMesh *create_orco_dm(Object *ob, Mesh *me, BMEditMesh *em, int lay
if(free) MEM_freeN(orco);
}
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
return dm;
}
@@ -1238,7 +1238,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
if(deformedVerts) {
CDDM_apply_vert_coords(*deform_r, deformedVerts);
CDDM_calc_normals(*deform_r);
CDDM_calc_normals_mapping(*deform_r);
}
}
} else {
@@ -1322,7 +1322,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
/* XXX, this covers bug #23673, but we may need normal calc for other types */
if(dm && dm->type == DM_TYPE_CDDM) {
CDDM_apply_vert_coords(dm, deformedVerts);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
}
}
@@ -1344,7 +1344,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
dm = tdm;
CDDM_apply_vert_coords(dm, deformedVerts);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
}
} else {
dm = CDDM_from_mesh(me, ob);
@@ -1354,7 +1354,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
if(deformedVerts) {
CDDM_apply_vert_coords(dm, deformedVerts);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
}
/* Constructive modifiers need to have an origindex
@@ -1473,7 +1473,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
dm->release(dm);
CDDM_apply_vert_coords(finaldm, deformedVerts);
CDDM_calc_normals(finaldm);
CDDM_calc_normals_mapping(finaldm);
if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
add_weight_mcol_dm(ob, finaldm, draw_flag);
@@ -1495,7 +1495,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
}
if(recalc_normals)
CDDM_calc_normals(finaldm);
CDDM_calc_normals_mapping(finaldm);
if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
add_weight_mcol_dm(ob, finaldm, draw_flag);
@@ -1531,7 +1531,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
finaldm->recalcTesselation(finaldm);
/* if we have no modifiers applied we'lll still want the tessface normals
* to be calculated from the polygon noramals,
* 'CDDM_calc_normals' checks for this case - campbell */
* 'CDDM_calc_normals_mapping' checks for this case - campbell */
finaldm->calcNormals(finaldm);
/* Need to watch this, it can cause issues, see bug [#29338] */
/* take care with this block, we really need testing frameworks */
@@ -1657,7 +1657,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D
dm = tdm;
CDDM_apply_vert_coords(dm, deformedVerts);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
} else if(cage_r && dm == *cage_r) {
/* dm may be changed by this modifier, so we need to copy it
*/
@@ -1669,7 +1669,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D
if(deformedVerts) {
CDDM_apply_vert_coords(dm, deformedVerts);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
}
}
@@ -1747,7 +1747,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D
if(!(cage_r && dm == *cage_r)) dm->release(dm);
CDDM_apply_vert_coords(*final_r, deformedVerts);
CDDM_calc_normals(*final_r);
CDDM_calc_normals_mapping(*final_r);
} else if (dm) {
*final_r = dm;
(*final_r)->calcNormals(*final_r); /* BMESH_ONLY - BMESH_TODO. check if this is needed */

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

@@ -1653,7 +1653,7 @@ static CDDerivedMesh *cdDM_create(const char *desc)
dm->getEdgeDataArray = DM_get_edge_data_layer;
dm->getTessFaceDataArray = DM_get_tessface_data_layer;
dm->calcNormals = CDDM_calc_normals;
dm->calcNormals = CDDM_calc_normals_mapping;
dm->recalcTesselation = CDDM_recalc_tesselation;
dm->getVertCos = cdDM_getVertCos;
@@ -2226,7 +2226,7 @@ void CDDM_apply_vert_normals(DerivedMesh *dm, short (*vertNormals)[3])
copy_v3_v3_short(vert->no, vertNormals[i]);
}
void CDDM_calc_normals(DerivedMesh *dm)
void CDDM_calc_normals_mapping(DerivedMesh *dm)
{
CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
float (*face_nors)[3] = NULL;

6
source/blender/blenkernel/intern/displist.c
View File

@@ -891,7 +891,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
dm = tdm;
CDDM_apply_vert_coords(dm, vertCos);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
}
} else {
if (vertCos) {
@@ -904,7 +904,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
dm= CDDM_from_curve_customDB(ob, dispbase);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
}
if (vertCos) {
@@ -932,7 +932,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
dm = tdm;
CDDM_apply_vert_coords(dm, vertCos);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
MEM_freeN(vertCos);
} else {
displist_apply_allverts(dispbase, vertCos);

4
source/blender/blenkernel/intern/dynamicpaint.c
View File

@@ -1534,7 +1534,7 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Deri
else return;
if (update_normals)
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
}
/*
@@ -1742,7 +1742,7 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData
normal_short_to_float_v3(normal, mvert[i].no);
madd_v3_v3fl(mvert[i].co, normal, wPoint[i].height);
}
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
}
/* displace */

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

@@ -409,7 +409,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
result = arrayModifier_doArray(amd, md->scene, ob, dm, 0);
//if(result != dm)
// CDDM_calc_normals(result);
// CDDM_calc_normals_mapping(result);
return result;
}

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

@@ -195,7 +195,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
result = BME_bmesh_to_derivedmesh(bm,derivedData);
BME_free_mesh(bm);
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
return result;
}

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

@@ -278,7 +278,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
}
}
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
BLI_ghash_free(vertHash, NULL, NULL);
BLI_ghash_free(edgeHash, NULL, NULL);

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

@@ -88,7 +88,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
if(result)
{
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
return result;
}
return dm;

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

@@ -132,7 +132,7 @@ static void deformVerts(ModifierData *md, Object *ob,
unsigned int numverts = 0;
CDDM_apply_vert_coords(dm, vertexCos);
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
current_time = BKE_curframe(md->scene);

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

@@ -153,7 +153,7 @@ static DerivedMesh *applyModifier(
result = edgesplitModifier_do(emd, ob, derivedData);
if(result != derivedData)
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
return result;
}

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

@@ -953,7 +953,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd,
/* finalization */
CDDM_calc_edges(explode);
CDDM_tessfaces_to_faces(explode);
CDDM_calc_normals(explode);
CDDM_calc_normals_mapping(explode);
if(psmd->psys->lattice){
end_latt_deform(psmd->psys->lattice);

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

@@ -311,7 +311,7 @@ static DerivedMesh *fluidsim_read_obj(const char *filename)
CDDM_apply_vert_normals(dm, (short (*)[3])normals);
MEM_freeN(normals);
// CDDM_calc_normals(result);
// CDDM_calc_normals_mapping(result);
return dm;
}

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

@@ -402,7 +402,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
/* why is this needed? - campbell */
/* recalculate normals */
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
/* free hashes */
BLI_ghash_free(vertHash, NULL, NULL);

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

@@ -320,7 +320,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
result = mirrorModifier__doMirror(mmd, ob, derivedData);
if(result != derivedData)
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
return result;
}

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

@@ -541,7 +541,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
result = doOcean(md, ob, derivedData, 0);
if(result != derivedData)
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
return result;
}

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

@@ -304,7 +304,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob,
}
CDDM_calc_edges(result);
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
if(psys->lattice){
end_latt_deform(psys->lattice);

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

@@ -166,7 +166,7 @@ static void deformVerts(ModifierData *md, Object *ob,
/* make new dm */
psmd->dm=CDDM_copy(dm, 0);
CDDM_apply_vert_coords(psmd->dm, vertexCos);
CDDM_calc_normals(psmd->dm);
CDDM_calc_normals_mapping(psmd->dm);
if(needsFree){
dm->needsFree = 1;

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

@@ -187,7 +187,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
MEM_freeN(output);
CDDM_calc_edges(result);
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
/* BMESH_TODO - create polygons */
@@ -198,7 +198,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
#else /* BMESH ONLY */
dm = CDDM_copy(result, 1); /*builds ngon faces from tess (mface) faces*/
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
result->needsFree = 1;
result->release(result);

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

@@ -906,7 +906,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
if((ltmd->flag & MOD_SCREW_NORMAL_CALC) == 0) {
/* BMESH_TODO, we only need to get vertex normals here, this is way overkill */
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
}
return result;

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

@@ -726,7 +726,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
/* must recalculate normals with vgroups since they can displace unevenly [#26888] */
if(dvert) {
/* BMESH_TODO, we only need to get vertex normals here, this is way overkill */
CDDM_calc_normals(result);
CDDM_calc_normals_mapping(result);
}
if (dm != odm) {

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

@@ -116,7 +116,7 @@ static void deformVerts(ModifierData *md, Object *ob,
MVert *x, *v;
CDDM_apply_vert_coords(surmd->dm, vertexCos);
CDDM_calc_normals(surmd->dm);
CDDM_calc_normals_mapping(surmd->dm);
numverts = surmd->dm->getNumVerts ( surmd->dm );

4
source/blender/modifiers/intern/MOD_util.c
View File

@@ -173,7 +173,7 @@ DerivedMesh *get_cddm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float
}
if(dm)
CDDM_calc_normals(dm);
CDDM_calc_normals_mapping(dm);
return dm;
}
@@ -190,7 +190,7 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float (*
if(vertexCos) {
CDDM_apply_vert_coords(dm, vertexCos);
//CDDM_calc_normals(dm);
//CDDM_calc_normals_mapping(dm);
}
if(orco)