diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-20 17:25:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-20 17:25:54 +0400 |
commit | 1b505e6d1ba341d13f13a327fca1416e6cc753ef (patch) | |
tree | d84e10a589e70a1d6dfb638d34928f7ff496200d /source/blender/modifiers | |
parent | 444613cdbaa3cfa145f042b135e95e46b65b0e17 (diff) |
replace CDDM_calc_normals_mapping with CDDM_calc_normals when used within modifiers.
this way modifiers wont be calculating tessface's which CDDM_calc_normals_mapping will do if not already calculated.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mask.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_solidify.c | 3 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_surface.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 4 |
16 files changed, 18 insertions, 19 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 3ff6d84f1f6..dc2a3588884 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_mapping(result); + CDDM_calc_normals(result); return result; } diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 78bc64be1cd..6c9bbd11e9c 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_mapping(result); + CDDM_calc_normals(result); return result; } return dm; diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 2de7400065f..99d608351d8 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_mapping(dm); + CDDM_calc_normals(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 571f01d570e..809a35fa4f2 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_mapping(result); + CDDM_calc_normals(result); return result; } diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 75d9e7e0782..afbc7e2a046 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_tessface(explode); CDDM_tessfaces_to_faces(explode); - CDDM_calc_normals_mapping(explode); + CDDM_calc_normals(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 0aea2650895..b5439d4103b 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_mapping(result); + // CDDM_calc_normals(result); return dm; } diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index b4f76ede545..edef19fd032 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_mapping(result); + CDDM_calc_normals(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 70e7d6c0d48..37800d3cce5 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_mapping(result); + CDDM_calc_normals(result); return result; } diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 2910fd515ec..296e377f6fa 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_mapping(result); + CDDM_calc_normals(result); return result; } diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index aaa3088f747..3f600947b1a 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -304,7 +304,6 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob, } CDDM_calc_edges_tessface(result); - CDDM_calc_normals_mapping(result); if(psys->lattice){ end_latt_deform(psys->lattice); @@ -315,6 +314,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob, MEM_freeN(size); CDDM_tessfaces_to_faces(result); /*builds ngon faces from tess (mface) faces*/ + CDDM_calc_normals(result); return result; } diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 42061222156..4021a8a8114 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_mapping(psmd->dm); + CDDM_calc_normals(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 f1f09e1db1e..c37a8bccedf 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -187,18 +187,18 @@ static DerivedMesh *applyModifier(ModifierData *md, MEM_freeN(output); CDDM_calc_edges_tessface(result); - CDDM_calc_normals_mapping(result); /* BMESH_TODO - create polygons */ #if 0 + CDDM_calc_normals(result); return result; #else /* BMESH ONLY */ dm = CDDM_copy(result, 1); /*builds ngon faces from tess (mface) faces*/ - CDDM_calc_normals_mapping(dm); + CDDM_calc_normals(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 c5d99a939b9..8ff4080b99b 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_mapping(result); + CDDM_calc_normals(result); } return result; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index b3bd6ed1487..259b4509f5a 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -696,8 +696,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_mapping(result); + CDDM_calc_normals(result); } return result; diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 830cdb9ebb0..161bdcaf4ac 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_mapping(surmd->dm); + CDDM_calc_normals(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 f8386f6e408..9c6d87d0074 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_mapping(dm); + CDDM_calc_normals(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_mapping(dm); + //CDDM_calc_normals(dm); } if(orco) |