From 145b47a550425acc2055c6494e302d67c0b6c042 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Tue, 13 Feb 2018 17:47:38 +0100
Subject: [PATCH 1/2] Fix Windows builds

`std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds
---
 components/terrain/compositemaprenderer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp
index 6626a5713..f9dae5b2f 100644
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@@ -6,6 +6,8 @@
 #include <osg/Texture2D>
 #include <osg/RenderInfo>
 
+#include <algorithm>
+
 namespace Terrain
 {
 

From 9b8c56761b5c9b398aebb91fec6adf25208c24d9 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Tue, 13 Feb 2018 18:25:28 +0000
Subject: [PATCH 2/2] Fix timing error

---
 components/terrain/compositemaprenderer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp
index f9dae5b2f..d3fdfa1f8 100644
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@@ -64,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