diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-31 10:28:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-31 10:28:11 +0400 |
| commit | 54e8cacdcf5fb06441530d7c5b10265733f6e54f (patch) | |
| tree | 2f5a7fb07ae1894d19d6687a10d517bedda9d664 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 58a748431e7b3b268a0b8f77b09279ed0c19eca2 (diff) | |
improve edgering subdivide curvature calculations (calculate length projected onto the normal plane).
also correct recely added asserts.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index fc5b91a93cc..dd36ea4bcd8 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -873,7 +873,7 @@ static void modwrap_deformVerts( ModifierApplyFlag flag) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_assert(CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); + BLI_assert(!dm || CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); if (dm && mti->dependsOnNormals && mti->dependsOnNormals(md)) { DM_ensure_normals(dm); @@ -887,7 +887,7 @@ static void modwrap_deformVertsEM( float (*vertexCos)[3], int numVerts) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_assert(CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); + BLI_assert(!dm || CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); if (dm && mti->dependsOnNormals && mti->dependsOnNormals(md)) { DM_ensure_normals(dm); |