Merge branch 'master' into jc3-importer-open-error-handling

2021-05-07 14:49:00 -04:00
parent de5c8ece6f d7c65d363c
commit 6eb15080ec
12 changed files with 58 additions and 98 deletions
--- a/code/AssetLib/IFC/IFCLoader.cpp
+++ b/code/AssetLib/IFC/IFCLoader.cpp
@@ -115,7 +115,7 @@ static const aiImporterDesc desc = {
    0,
    0,
    0,
-    "ifc ifczip stp"
+    "ifc ifczip step stp"
 };

 // ------------------------------------------------------------------------------------------------
--- a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
+++ b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
@@ -57,6 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <iomanip>
 #include <sstream>
+#include <map>

 #ifdef MDL_HALFLIFE_LOG_WARN_HEADER
 #undef MDL_HALFLIFE_LOG_WARN_HEADER