From 9d06ad8f80c1a8b9981b2233bdec5ddcb47a7911 Mon Sep 17 00:00:00 2001
From: Jonathan Kunstwald <kontakt@jonathankunstwald.de>
Date: Sat, 16 Jun 2018 14:46:01 +0200
Subject: [PATCH] Reintroduce valid data flag
---
assimp/glow-extras/assimp/Importer.cc | 3 +++
assimp/glow-extras/assimp/Importer.hh | 1 +
2 files changed, 4 insertions(+)
diff --git a/assimp/glow-extras/assimp/Importer.cc b/assimp/glow-extras/assimp/Importer.cc
index 313f99c..fdb6dcd 100644
--- a/assimp/glow-extras/assimp/Importer.cc
+++ b/assimp/glow-extras/assimp/Importer.cc
@@ -61,6 +61,8 @@ glow::SharedVertexArray glow::assimp::Importer::LoadAndCreateMesh(std::string co
glow::SharedVertexArray glow::assimp::Importer::CreateMeshFromData(const MeshData & data)
{
+ if (!data.valid) return nullptr;
+
std::vector<SharedArrayBuffer> abs;
if (!data.positions.empty())
@@ -229,5 +231,6 @@ glow::assimp::Importer::MeshData glow::assimp::Importer::LoadData(std::string co
}
data.filename = filename;
+ data.valid = true;
return data;
}
diff --git a/assimp/glow-extras/assimp/Importer.hh b/assimp/glow-extras/assimp/Importer.hh
index 746ba15..a480d1a 100644
--- a/assimp/glow-extras/assimp/Importer.hh
+++ b/assimp/glow-extras/assimp/Importer.hh
@@ -87,6 +87,7 @@ public:
std::vector<std::vector<glm::vec4>> colors;
std::vector<uint32_t> indices;
std::string filename;
+ bool valid = false;
};
Importer();
--
GitLab