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

OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up

Browse Source
This commit is contained in:
Turo Lamminen
2017-10-05 12:35:17 +03:00
parent 316046f748
commit b6d2b91799
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/OpenGEXImporter.cpp
View File

@@ -1231,9 +1231,9 @@ void OpenGEXImporter::pushNode( aiNode *node, aiScene *pScene ) {
if( m_nodeChildMap.end() == it ) {
info = new ChildInfo;
m_root = info;
m_nodeChildMap[ node->mParent ] = info;
m_nodeChildMap[ node->mParent ] = std::unique_ptr<ChildInfo>(info);
} else {
info = it->second;
info = it->second.get();
}
info->m_children.push_back( node );
} else {
@@ -1243,9 +1243,9 @@ void OpenGEXImporter::pushNode( aiNode *node, aiScene *pScene ) {
NodeChildMap::iterator it( m_nodeChildMap.find( node->mParent ) );
if( m_nodeChildMap.end() == it ) {
info = new ChildInfo;
m_nodeChildMap[ node->mParent ] = info;
m_nodeChildMap[ node->mParent ] = std::unique_ptr<ChildInfo>(info);
} else {
info = it->second;
info = it->second.get();
}
info->m_children.push_back( node );
}