3 commits

Author	SHA1	Message	Date
Michaël Lemaire	1d9d24b958	vegetation: Fixed segfault in unit test	2015-12-13 17:47:22 +01:00
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	9d7a7a0ff7	Added vegetation impostors to OpenGL renderer ... This is currently an unoptimized and broken version, to be improved	2015-11-25 23:15:58 +01:00