Merge branch 'master' into patch-1

makerbot · Sep 13, 2019 · cc7ba52 · cc7ba52
2 parents f985bcb + ee1ed50
commit cc7ba52
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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);
+        }
     }
 }