Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO

Conflicts:
	include/Engine/Rendering/Renderer.h
	src/Engine/Rendering/Renderer.cpp

include/Engine/Rendering/DrawFinalPass.h

@@ -20,6 +20,7 @@ public:
     void InitializeShaderPrograms();
     void Draw(RenderScene& scene, GLuint SSAOTexture);
     void ClearBuffer();
+    void OnWindowResize();
 
 	//Return the texture that is used in later stages to apply the bloom effect
 	GLuint DepthBuffer() const { return m_DepthBuffer; }
@@ -34,7 +35,6 @@ public:
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
     FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
-
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;