Merge remote-tracking branch 'origin/master' into RendererBugFixes

Conflicts:
	include/Engine/Rendering/DrawFinalPass.h
This commit is contained in:
Teejoon
2016-03-09 16:54:26 +01:00
97 changed files with 5766 additions and 8259 deletions
+2
View File
@@ -18,6 +18,7 @@
#include "DrawColorCorrectionPass.h"
#include "SSAOPass.h"
#include "CubeMapPass.h"
#include "BlurHUD.h"
#include "../Core/EventBroker.h"
#include "ImGuiRenderPass.h"
#include "Camera.h"
@@ -76,6 +77,7 @@ private:
DrawColorCorrectionPass* m_DrawColorCorrectionPass;
SSAOPass* m_SSAOPass;
CubeMapPass* m_CubeMapPass;
BlurHUD* m_BlurHUDPass;
//----------------------Functions----------------------//
void InitializeWindow();