rename CDDM_calc_normals() --> CDDM_calc_normals_mapping
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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 );
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user