Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts: # src/Engine/Rendering/DrawFinalPassState.cpp # src/Engine/Rendering/PickingPass.cpp # src/Engine/Rendering/Renderer.cpp
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
#include "FrameBuffer.h"
|
||||
#include "../Core/World.h"
|
||||
#include "PickingPass.h"
|
||||
#include "DrawScenePass.h"
|
||||
#include "LightCullingPass.h"
|
||||
#include "DrawFinalPass.h"
|
||||
#include "DrawScreenQuadPass.h"
|
||||
@@ -46,7 +45,6 @@ private:
|
||||
Model* m_UnitQuad;
|
||||
Model* m_UnitSphere;
|
||||
|
||||
DrawScenePass* m_DrawScenePass;
|
||||
PickingPass* m_PickingPass;
|
||||
LightCullingPass* m_LightCullingPass;
|
||||
ImGuiRenderPass* m_ImGuiRenderPass;
|
||||
|
||||
Reference in New Issue
Block a user