Merge branch 'deffered_rendering' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into deffered_rendering

Conflicts:
	src/Renderer.cpp
This commit is contained in:
Tleety
2014-05-30 22:47:23 +02:00
3 changed files with 19 additions and 4 deletions
+2
View File
@@ -123,6 +123,8 @@ public:
);
}
}
RenderQueue.Sort();
}
protected: