diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 04:12:24 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 04:12:24 +0400 |
commit | ded0af482b82cc31ed10c2d03e5f07aedb299c50 (patch) | |
tree | 53296785dc6aa94878b8723e3c31033ee70536d1 | |
parent | 2b2c1007f6a960274f3ddbcfa0ac2849e65894c9 (diff) |
rename CDDM_calc_normals() --> CDDM_calc_normals_mapping
23 files changed, 43 insertions, 43 deletions
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index 4621583c25c..d1926c3f3ef 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -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 diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index fcdad3f4c5e..2880473dd37 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -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 */ diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 7aee5d4b5aa..8a08f8b0218 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -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; @@ -2259,9 +2259,9 @@ void CDDM_calc_normals(DerivedMesh *dm) /* calculate face normals */ mesh_calc_normals_mapping_ex(cddm->mvert, dm->numVertData, CDDM_get_loops(dm), CDDM_get_polys(dm), - dm->numLoopData, dm->numPolyData, NULL, cddm->mface, dm->numTessFaceData, - CustomData_get_layer(&dm->faceData, CD_POLYINDEX), face_nors, - only_face_normals); + dm->numLoopData, dm->numPolyData, NULL, cddm->mface, dm->numTessFaceData, + CustomData_get_layer(&dm->faceData, CD_POLYINDEX), face_nors, + only_face_normals); CustomData_add_layer(&dm->faceData, CD_NORMAL, CD_ASSIGN, face_nors, dm->numTessFaceData); diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 8810dae9d70..a4d07969604 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -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); diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 294b4e4bde4..070f091b10a 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -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 */ diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 0e1aa0f9473..3c599d6eafd 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -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; } diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 606b20d3ccd..57d8943f681 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -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; } diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 63c83dcaf54..16b19e82e97 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 6c9bbd11e9c..78bc64be1cd 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -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; diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 99d608351d8..2de7400065f 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 7acdcd8a5fe..2984a387fd8 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -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; } diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index e6e3ef2a0aa..4af4cc74b5b 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index fe6ddb03c64..069fb653d28 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -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; } diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index edef19fd032..b4f76ede545 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 37800d3cce5..70e7d6c0d48 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -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; } diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index f5e5c175972..03285fd65f7 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -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; } diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 3f8f44bdfd9..56f7ce37c26 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 4021a8a8114..42061222156 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -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; diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 26e7f8fdbb1..2852c4b90bb 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 8ff4080b99b..c5d99a939b9 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -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; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 0248bf6682a..e32d788f602 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -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) { diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 161bdcaf4ac..830cdb9ebb0 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -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 ); diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 85172c3527c..5a1eb6daae2 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -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) |