From 768c19db1dd0c066affd43bbd47dab2eaf29328b Mon Sep 17 00:00:00 2001
From: TheNumbat <mjslater@andrew.cmu.edu>
Date: Wed, 30 Sep 2020 19:35:47 -0400
Subject: [PATCH] drop normals on scene load

---
 src/scene/scene.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index f432dc2..d6143bf 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -314,11 +314,6 @@ static void load_node(Scene &scobj, std::vector<std::string> &errors,
             }
         }
 
-        if (!mesh->HasNormals()) {
-            errors.push_back("Mesh has no normals.");
-            continue;
-        }
-
         std::vector<Vec3> verts;
 
         for (unsigned int j = 0; j < mesh->mNumVertices; j++) {
@@ -500,10 +495,11 @@ std::string Scene::load(bool new_scene, Undo &undo, Gui::Manager &gui, std::stri
 
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(
-        file.c_str(), aiProcess_GenSmoothNormals | aiProcess_PopulateArmatureData |
-                          aiProcess_ValidateDataStructure | aiProcess_OptimizeMeshes |
-                          aiProcess_FindInstances | aiProcess_FindDegenerates |
-                          aiProcess_JoinIdenticalVertices | aiProcess_FindInvalidData);
+        file.c_str(), aiProcess_PopulateArmatureData | aiProcess_FixInfacingNormals |
+                      aiProcess_ValidateDataStructure | aiProcess_OptimizeMeshes |
+                      aiProcess_FindInstances | aiProcess_FindDegenerates |
+                      aiProcess_DropNormals | aiProcess_JoinIdenticalVertices |
+                      aiProcess_FindInvalidData);
 
     if (!scene) {
         return "Parsing scene " + file + ": " + std::string(importer.GetErrorString());
-- 
GitLab