Merge pull request #386 from OpenMW/master

Add OpenMW commits up to 13 Feb 2018, part 2
0.6.3
David Cernat 7 years ago committed by GitHub
commit 65c3472772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -6,6 +6,8 @@
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osg/RenderInfo> #include <osg/RenderInfo>
#include <algorithm>
namespace Terrain namespace Terrain
{ {
@ -62,6 +64,7 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
mCompileSet.erase(mCompileSet.begin()); mCompileSet.erase(mCompileSet.begin());
} }
} }
mTimer.setStartTick();
} }
void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &renderInfo, double* timeLeft) const void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &renderInfo, double* timeLeft) const

Loading…
Cancel
Save