v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FBXImporter: Fix GetUniqueName to return names properly

pull/2058/head
Kenneth Perry (thothonegan) 2018-07-13 15:25:04 -05:00
parent 3c6ba8162b
commit 7967f0a33f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/FBXConverter.cpp
View File

@ -407,14 +407,15 @@ static bool HasName( NodeNameCache &cache, const std::string &name ) {
return it != cache.end(); return it != cache.end();
} }
void Converter::GetUniqueName( const std::string &name, std::string uniqueName ) { void Converter::GetUniqueName( const std::string &name, std::string& uniqueName ) {
if ( !HasName( mNodeNames, name ) ) { if ( !HasName( mNodeNames, name ) ) {
uniqueName = name; uniqueName = name;
mNodeNames.push_back( uniqueName );
return; return;
} }
int i( 0 ); int i( 0 );
std::string newName; std::string newName (name);
while ( HasName( mNodeNames, newName ) ) { while ( HasName( mNodeNames, newName ) ) {
++i; ++i;
newName.clear(); newName.clear();

2
code/FBXConverter.h
View File

@ -131,7 +131,7 @@ private:
void ConvertCamera( const Camera& cam, const std::string &orig_name ); void ConvertCamera( const Camera& cam, const std::string &orig_name );
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void GetUniqueName( const std::string &name, std::string uniqueName ); void GetUniqueName( const std::string &name, std::string& uniqueName );
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// this returns unified names usable within assimp identifiers (i.e. no space characters - // this returns unified names usable within assimp identifiers (i.e. no space characters -