GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source 
# Conflicts:
#	Source/Engine/Audio/Audio.cpp
This commit is contained in:
Wojtek Figat
2024-07-05 22:18:40 +02:00
parent 230c57cca4 009e1aaebb
commit 559cd74647
122 changed files with 8832 additions and 4272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
View File

@@ -23,21 +23,20 @@
#include <ThirdParty/assimp/LogStream.hpp>
#include <ThirdParty/assimp/DefaultLogger.hpp>
#include <ThirdParty/assimp/Logger.hpp>
using namespace Assimp;
class AssimpLogStream : public LogStream
class AssimpLogStream : public Assimp::LogStream
{
public:
AssimpLogStream()
{
DefaultLogger::create("");
DefaultLogger::get()->attachStream(this);
Assimp::DefaultLogger::create("");
Assimp::DefaultLogger::get()->attachStream(this);
}
~AssimpLogStream()
{
DefaultLogger::get()->detatchStream(this);
DefaultLogger::kill();
Assimp::DefaultLogger::get()->detachStream(this);
Assimp::DefaultLogger::kill();
}
void write(const char* message) override
@@ -148,7 +147,7 @@ struct AssimpBone
struct AssimpImporterData
{
Importer AssimpImporter;
Assimp::Importer AssimpImporter;
AssimpLogStream AssimpLogStream;
const String Path;
const aiScene* Scene = nullptr;