4 Commits

Author	SHA1	Message	Date
Tleety	ecf524eb4e	Merge remote-tracking branch 'origin/master' into Forward+ ... # Conflicts: # include/Engine/Rendering/PickingPass.h # include/Engine/Rendering/Renderer.h # resources/Schema/Entities/Test.xml # src/Engine/Rendering/DrawScenePass.cpp # src/Engine/Rendering/PickingPass.cpp # src/Engine/Rendering/RenderQueueFactory.cpp # src/Engine/Rendering/Renderer.cpp	2016-01-15 11:01:58 +01:00
Tleety	0cf8d26557	Revert "Revert "Forward+"" ... This reverts commit b908a9f9c6.	2016-01-11 17:56:58 +01:00
Jace	b908a9f9c6	Revert "Forward+"	2016-01-11 13:48:55 +01:00
Tleety	e510f2b88c	Forward plus render pass now removed from Renderer.cpp to it's own class.	2016-01-06 11:32:42 +01:00