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

src/graphics/shaders_util.hpp

@@ -1,7 +1,6 @@
 #ifndef SHADERS_UTIL_HPP
 #define SHADERS_UTIL_HPP
 
-#include "graphics/irr_driver.hpp"
 #include "utils/singleton.hpp"
 #include <vector>
 #include <matrix4.h>
@@ -58,7 +57,7 @@ GLint LoadProgram(AttributeType Tp, Types ... args)
 {
     GLint ProgramID = glCreateProgram();
     loadAndAttach(ProgramID, args...);
-    if (irr_driver->getGLSLVersion() < 330)
+    if (getGLSLVersion() < 330)
         setAttribute(Tp, ProgramID);
     glLinkProgram(ProgramID);
 

src/tracks/model_definition_loader.hpp

@@ -23,6 +23,7 @@ class LODNode;
 class Track;
 class STKInstancedSceneNode;
 
+#include <cassert>
 #include <map>
 #include <vector>
 #include <string>