Merge pull request #386 from OpenMW/master

Add OpenMW commits up to 13 Feb 2018, part 2
7 years ago · 65c3472772
parent 886b3431bc 9b8c56761b
commit 65c3472772
1 changed files with 3 additions and 0 deletions
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@ -6,6 +6,8 @@
 #include <osg/Texture2D>
 #include <osg/RenderInfo>

+#include <algorithm>
+
 namespace Terrain
 {

@ -62,6 +64,7 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
            mCompileSet.erase(mCompileSet.begin());
        }
    }
+    mTimer.setStartTick();
 }

 void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &renderInfo, double* timeLeft) const