Merge branch 'master' into fixbuild

2018-06-15 20:40:06 +02:00
parent 651d9c8ea1 878b4b2c18
commit e29437ff3b
1 changed files with 1 additions and 1 deletions
--- a/code/FBXDocumentUtil.cpp
+++ b/code/FBXDocumentUtil.cpp
@@ -115,7 +115,7 @@ std::shared_ptr<const PropertyTable> GetPropertyTable(const Document& doc,
        }
    }

-    if(!Properties70) {
+    if(!Properties70 || !Properties70->Compound()) {
        if(!no_warn) {
            DOMWarning("property table (Properties70) not found",&element);
        }