added postprocessing step to fix degenerates in assimp, bacuase trying

to add degenerates violates assertions

added postprocessing step to fix degenerates in assimp, bacuase trying
to add degenerates violates assertions
8662a68a · Martin Schultz · 240e752f · 8662a68a
Commit 8662a68a authored May 08, 2018 by Martin Schultz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc +2 -2

No files found.
--- a/PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc
+++ b/PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc
@@ -335,9 +335,9 @@ int AssimpPlugin::loadObject(QString _filename) {

  const aiScene* scene = NULL;
  if (type_ == DATA_TRIANGLE_MESH)
-    scene = importer.ReadFile(_filename.toStdString(), aiProcess_JoinIdenticalVertices | aiProcess_Triangulate);
+    scene = importer.ReadFile(_filename.toStdString(), aiProcess_JoinIdenticalVertices | aiProcess_Triangulate | aiProcess_FindDegenerates);
  else
-    scene = importer.ReadFile(_filename.toStdString(), aiProcess_JoinIdenticalVertices);
+    scene = importer.ReadFile(_filename.toStdString(), aiProcess_JoinIdenticalVertices | aiProcess_FindDegenerates);

  if (!scene) {
    emit log(LOGERR, tr(importer.GetErrorString()));