Merge branch 'master' into FrameAttempt

2015-09-17 15:45:08 +02:00
parent 53a9cbd4d8 692e0ca9df
commit f6721986c7
33 changed files with 18573 additions and 80 deletions
@@ -52,6 +52,8 @@ struct ModelJob : RenderJob
 	unsigned int ShaderID;
 	unsigned int TextureID;

+	std::string fileName;
+
 	glm::mat4 ModelMatrix;
 	GLuint DiffuseTexture;
 	GLuint NormalTexture;