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 /source/blender/blenkernel | |
parent | 2b2c1007f6a960274f3ddbcfa0ac2849e65894c9 (diff) |
rename CDDM_calc_normals() --> CDDM_calc_normals_mapping
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_cdderivedmesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 |
5 files changed, 23 insertions, 23 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 */ |