5 commits

Author	SHA1	Message	Date
Michaël Lemaire	4a710c0977	Merge branch 'master' into vegetation ... Conflicts: src/interface/commandline/tests.cpp src/render/opengl/OpenGLPart.h src/render/opengl/OpenGLRenderer.cpp src/render/opengl/OpenGLRenderer.h src/render/opengl/OpenGLShaderProgram.h src/render/opengl/OpenGLSharedState.h src/render/software/SoftwareCanvasRenderer.h	2015-12-13 17:16:26 +01:00
Michaël Lemaire	7d4989b670	using namespace std	2015-12-11 00:36:50 +01:00
Michaël Lemaire	479dcb03ac	Added opengl resources deleting at exit (textures, arrays...)	2015-12-10 23:41:42 +01:00
Michaël Lemaire	9196be4c05	Merge branch 'master' into vegetation ... Conflicts: src/render/opengl/OpenGLShaderProgram.cpp src/render/opengl/OpenGLShaderProgram.h src/render/opengl/opengl_global.h	2015-12-08 01:28:15 +01:00
Michaël Lemaire	f242f55f81	Switched OpenGL to core profile	2015-12-07 23:32:55 +01:00