Merge pull request #713 from ov/normalize-safe

GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
parent 891411514b 6e2b0b4fd1
commit 7e85f45abc
3 changed files with 12 additions and 2 deletions
@@ -192,7 +192,7 @@ bool GenVertexNormalsProcess::GenMeshVertexNormals (aiMesh* pMesh, unsigned int
                const aiVector3D& v = pMesh->mNormals[verticesFound[a]];
                if (is_not_qnan(v.x))pcNor += v;
            }
-            pcNor.Normalize();
+            pcNor.NormalizeSafe();

            // Write the smoothed normal back to all affected normals
            for (unsigned int a = 0; a < verticesFound.size(); ++a)
@@ -225,7 +225,7 @@ bool GenVertexNormalsProcess::GenMeshVertexNormals (aiMesh* pMesh, unsigned int
                if (v * vr >= fLimit * vrlen * v.Length())
                    pcNor += v;
            }
-            pcNew[i] = pcNor.Normalize();
+            pcNew[i] = pcNor.NormalizeSafe();
        }
    }