Merge branch 'master' into patch-1

2019-09-13 14:35:29 +02:00
parent f985bcba83 ee1ed502e7
commit cc7ba5288c
1 changed files with 4 additions and 1 deletions
--- a/code/glTF/glTFExporter.cpp
+++ b/code/glTF/glTFExporter.cpp
@@ -242,7 +242,10 @@ inline Ref<Accessor> ExportData(Asset& a, std::string& meshName, Ref<Buffer>& bu

 namespace {
    void GetMatScalar(const aiMaterial* mat, float& val, const char* propName, int type, int idx) {
-        ai_assert(mat->Get(propName, type, idx, val) == AI_SUCCESS);
+        ai_assert( nullptr != mat );
+        if ( nullptr != mat ) {
+            mat->Get(propName, type, idx, val);
+        }
    }
 }