FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug in ProxyNode with DEFER_LOADING_TO_DATABASE_PAGER causing crash when children reorder during load.

Browse Source
This commit is contained in:
Laurens Voerman 2020-03-02 10:44:59 +01:00 committed by Robert Osfield
parent 76d7ec8e0f
commit 4cce2d75bc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgDB/DatabasePager.cpp
View File

@ -1646,7 +1646,12 @@ void DatabasePager::addLoadedDataToSceneGraph(const osg::FrameStamp &frameStamp)
osg::ProxyNode* proxyNode = dynamic_cast<osg::ProxyNode*>(group.get()); osg::ProxyNode* proxyNode = dynamic_cast<osg::ProxyNode*>(group.get());
if (proxyNode) if (proxyNode)
{ {
proxyNode->getDatabaseRequest(proxyNode->getNumChildren()) = 0; for (unsigned int i = 0; i < proxyNode->getNumFileNames(); ++i) {
if (proxyNode->getDatabaseRequest(i) == databaseRequest) {
proxyNode->getDatabaseRequest(i) = 0;
break;
}
}
} }
} }