Merge branch 'master' into master

2022-12-02 08:41:43 +01:00
parent f3f533c390 b0987f4513
commit d8b9e2b64b
94 changed files with 559 additions and 547 deletions
--- a/code/AssetLib/X/XFileImporter.cpp
+++ b/code/AssetLib/X/XFileImporter.cpp
@@ -97,7 +97,7 @@ const aiImporterDesc* XFileImporter::GetInfo () const {
 void XFileImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) {
    // read file into memory
    std::unique_ptr<IOStream> file( pIOHandler->Open( pFile));
-    if ( file.get() == nullptr ) {
+    if (file == nullptr) {
        throw DeadlyImportError( "Failed to open file ", pFile, "." );
    }