godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Revert "assimp: Sync with upstream 0201fc5"

Browse Source 
This reverts commit 78b22393a8.

It caused a regression in FBX import leading to crashes.
Fixes #36908.
This commit is contained in:
Rémi Verschelde
2020-03-09 10:42:18 +01:00
parent 471271b727
commit da1f80c1f2
224 changed files with 1515 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
thirdparty/assimp/code/Common/BaseImporter.cpp vendored
View File

@@ -3,7 +3,7 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2020, assimp team
Copyright (c) 2006-2019, assimp team
@@ -191,7 +191,7 @@ void BaseImporter::GetExtensionList(std::set<std::string>& extensions) {
}
std::unique_ptr<IOStream> pStream (pIOHandler->Open(pFile));
if (pStream) {
if (pStream.get() ) {
// read 200 characters from the file
std::unique_ptr<char[]> _buffer (new char[searchBytes+1 /* for the '\0' */]);
char *buffer( _buffer.get() );
@@ -283,6 +283,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) {
return "";
}
// thanks to Andy Maloney for the hint
std::string ret = file.substr( pos + 1 );
std::transform( ret.begin(), ret.end(), ret.begin(), ToLower<char>);
@@ -308,7 +309,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) {
};
magic = reinterpret_cast<const char*>(_magic);
std::unique_ptr<IOStream> pStream (pIOHandler->Open(pFile));
if (pStream) {
if (pStream.get() ) {
// skip to offset
pStream->Seek(offset,aiOrigin_SET);
@@ -602,7 +603,7 @@ unsigned int BatchLoader::AddLoadRequest(const std::string& file,
}
// no, we don't have it. So add it to the queue ...
m_data->requests.emplace_back(file, steps, map, m_data->next_id);
m_data->requests.push_back(LoadRequest(file,steps,map, m_data->next_id));
return m_data->next_id++;
}