mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

fixes enable and disable commands (#3186)

Browse Source 
This PR fixes a recent regression concerning enable and disable commands with object paging. In addition, we add a necessary comment to avoid such issues in the future.
This commit is contained in:
Bo Svensson 2021-10-23 10:40:26 +00:00 committed by GitHub
parent f70a154195
commit 41318a585f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/terrain/viewdata.cpp
View File

@ -74,6 +74,8 @@ const osg::Vec3f& ViewData::getViewPoint() const
return mViewPoint;
}
// NOTE: As a performance optimisation, we cache mRenderingNodes from previous frames here.
// If this cache becomes invalid (e.g. through mWorldUpdateRevision), we need to use clear() instead of reset().
void ViewData::reset()
{
// clear any unused entries
@ -164,9 +166,13 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
}
else if (!mostSuitableView)
{
if (vd->getWorldUpdateRevision() != mWorldUpdateRevision)
{
vd->setWorldUpdateRevision(mWorldUpdateRevision);
vd->clear();
}
vd->setViewPoint(viewPoint);
vd->setActiveGrid(activeGrid);
vd->setWorldUpdateRevision(mWorldUpdateRevision);
needsUpdate = true;
}
}