Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

# Conflicts:
#	indra/newview/llsurface.cpp
This commit is contained in:
Liru Færs
2020-03-23 01:04:25 -04:00
6 changed files with 35 additions and 29 deletions

View File

@@ -596,7 +596,7 @@ BOOL LLSurface::idleUpdate(F32 max_update_time)
// Always call updateNormals() / updateVerticalStats()
// every frame to avoid artifacts
for (auto& it = mDirtyPatchList.cbegin(); it != mDirtyPatchList.cend();)
for (auto it = mDirtyPatchList.cbegin(); it != mDirtyPatchList.cend();)
{
if (it->second.expired())
{