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
@@ -77,6 +77,8 @@ private:
 	GLuint m_ScreenQuad = 0;
 	Model* m_UnitSphere = nullptr;
 	Model* m_UnitQuad = nullptr;
+	Texture* m_StandardNormal;
+	Texture* m_StandardSpecular;

 	GLuint m_rbDepthBuffer = 0;
 	GLuint m_fbDeferred1 = 0;