Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason C
2021-05-07 14:49:00 -04:00
committed by GitHub
parent de5c8ece6f d7c65d363c
commit 6eb15080ec
12 changed files with 58 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/AssetLib/IFC/IFCLoader.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ static const aiImporterDesc desc = {
0,
0,
0,
"ifc ifczip stp"
"ifc ifczip step stp"
};
// ------------------------------------------------------------------------------------------------
code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
+1
View File
@@ -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