Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal

2018-05-17 09:36:53 +02:00
parent 9e80e18b1a d210707f5a
commit c788fff2b0
44 changed files with 334 additions and 78 deletions
--- a/code/FindDegenerates.cpp
+++ b/code/FindDegenerates.cpp
@@ -205,7 +205,7 @@ bool FindDegeneratesProcess::ExecuteOnMesh( aiMesh* mesh) {

                    // NOTE: we set the removed vertex index to an unique value
                    // to make sure the developer gets notified when his
-                    // application attemps to access this data.
+                    // application attempts to access this data.
                    face.mIndices[ face.mNumIndices ] = 0xdeadbeef;

                    if(first) {