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
+1
View File
@@ -435,6 +435,7 @@ void RenderSystem::Update(double dt)
}
RenderScene scene;
scene.ShouldBlur = true;
scene.Camera = m_Camera;
scene.Viewport = Rectangle(1280, 720);