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

# Conflicts: # src/Engine/Rendering/DrawFinalPass.cpp
2016-02-01 15:49:23 +01:00
parent 65f5bc673f 7408da401b
commit be3cfef65f
18 changed files with 552 additions and 194 deletions
@@ -13,7 +13,7 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer)

 void DrawBloomPass::InitializeTextures()
 {
-    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
 }

 void DrawBloomPass::InitializeShaderPrograms()