Merge branch 'master' of github.com:supertuxkart/stk-code into new_login

Conflicts:
	src/utils/profiler.cpp

src/graphics/render.cpp

@@ -214,13 +214,14 @@ void IrrDriver::renderGLSL(float dt)
         // Used to cull glowing items & lights
         const core::aabbox3df cambox = camnode->getViewFrustum()->getBoundingBox();
 
+        PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
         // Shadows
         if (!m_mipviz && !m_wireframe && UserConfigParams::m_shadows)
            //&& World::getWorld()->getTrack()->hasShadows())
         {
             renderShadows(camnode, camera);
         }
-
+        PROFILER_POP_CPU_MARKER();
 
         PROFILER_PUSH_CPU_MARKER("- Light", 0x00, 0xFF, 0x00);
 

src/utils/profiler.cpp

@@ -22,6 +22,8 @@
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "io/utf_writer.hpp"
+#include "utils/vs.hpp"
+
 #include <assert.h>
 #include <stack>
 #include <sstream>

src/utils/vs.hpp

@@ -8,5 +8,6 @@
 
 #  define isnan _isnan
 #  define roundf(x) (floorf(x + 0.5f))
+#  define round(x)  (floorf(x + 0.5))
 #endif