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

# Conflicts: # include/Engine/Rendering/RenderSystem.h # src/Engine/Rendering/RenderSystem.cpp
2016-01-22 17:02:56 +01:00
parent ea9c4d19d0 8cf83454d7
commit 46dff1a59c
95 changed files with 2515 additions and 1282 deletions
@@ -17,12 +17,13 @@

 struct RenderScene
 {
-    ::Camera* Camera;
+    ::Camera* Camera = nullptr;
    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
    std::list<std::shared_ptr<RenderJob>> TextJobs;
    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
    Rectangle Viewport;
+    bool ClearDepth = false;

 	void Clear()
 	{