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

Merge branch 'master' into common_base64

Browse Source
This commit is contained in:
Viktor Kovacs
2022-01-15 23:42:56 +01:00
committed by GitHub
parent c71f4bc95a 5976d54437
commit c8ab39dd04
3 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/assimp/IOSystem.hpp
View File

@@ -288,15 +288,6 @@ AI_FORCE_INLINE bool IOSystem::PushDirectory( const std::string &path ) {
return true;
}
// ----------------------------------------------------------------------------
AI_FORCE_INLINE const std::string &IOSystem::CurrentDirectory() const {
if ( m_pathStack.empty() ) {
static const std::string Dummy;
return Dummy;
}
return m_pathStack[ m_pathStack.size()-1 ];
}
// ----------------------------------------------------------------------------
AI_FORCE_INLINE size_t IOSystem::StackSize() const {
return m_pathStack.size();