Some merge fixes, needs more work

2015-12-18 15:28:44 +01:00
parent aeca1dec18
commit bd82f75dd0
9 changed files with 36 additions and 168 deletions
@@ -8,6 +8,7 @@
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
 #include "../Core/Entity.h"
+#include "Camera.h"

 class Model;
 class Skeleton;
@@ -168,6 +169,7 @@ struct RenderQueueCollection
 {
 	RenderQueue Forward;
 	RenderQueue Lights;
+    Camera* Camera;

 	void Clear()
 	{