Merge branch 'master' into include_fix
commit
f75c39593c
|
@ -1926,21 +1926,28 @@ const Collada::Node* ColladaLoader::FindNodeBySID( const Collada::Node* pNode, c
|
||||||
std::string ColladaLoader::FindNameForNode( const Collada::Node* pNode)
|
std::string ColladaLoader::FindNameForNode( const Collada::Node* pNode)
|
||||||
{
|
{
|
||||||
// If explicitly requested, just use the collada name.
|
// If explicitly requested, just use the collada name.
|
||||||
if (useColladaName) {
|
if (useColladaName)
|
||||||
return pNode->mName;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now setup the name of the assimp node. The collada name might not be
|
|
||||||
// unique, so we use the collada ID.
|
|
||||||
if (!pNode->mID.empty())
|
|
||||||
return pNode->mID;
|
|
||||||
else if (!pNode->mSID.empty())
|
|
||||||
return pNode->mSID;
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
// No need to worry. Unnamed nodes are no problem at all, except
|
if (!pNode->mName.empty()) {
|
||||||
// if cameras or lights need to be assigned to them.
|
return pNode->mName;
|
||||||
return format() << "$ColladaAutoName$_" << mNodeNameCounter++;
|
} else {
|
||||||
|
return format() << "$ColladaAutoName$_" << mNodeNameCounter++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Now setup the name of the assimp node. The collada name might not be
|
||||||
|
// unique, so we use the collada ID.
|
||||||
|
if (!pNode->mID.empty())
|
||||||
|
return pNode->mID;
|
||||||
|
else if (!pNode->mSID.empty())
|
||||||
|
return pNode->mSID;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// No need to worry. Unnamed nodes are no problem at all, except
|
||||||
|
// if cameras or lights need to be assigned to them.
|
||||||
|
return format() << "$ColladaAutoName$_" << mNodeNameCounter++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue