Fixed blendmaps

Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters

src/RenderQueue.h

@@ -30,10 +30,10 @@ struct ModelJob : RenderJob
 	unsigned int ShaderID;
 	unsigned int TextureID;
 
-	GLuint ShaderProgram;
 	GLuint DiffuseTexture;
 	GLuint NormalTexture;
 	GLuint SpecularTexture;
+	glm::vec4 Color;
 	GLuint VAO;
 	unsigned int StartIndex;
 	unsigned int EndIndex;
@@ -58,8 +58,8 @@ struct SpriteJob : RenderJob
 	unsigned int ShaderID;
 	unsigned int TextureID;
 
-	GLuint ShaderProgram;
 	GLuint Texture;
+	glm::vec4 Color;
 	glm::mat4 ModelMatrix;
 
 	void CalculateHash() override