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

BTH/axyz

# Conflicts:
#	include/Engine/Editor/EditorSystem.h
#	include/Engine/Rendering/EPicking.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/RawModel.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

This commit is contained in:

viktorljung

2016-01-12 16:13:20 +01:00

parent 2450769190 84818f6fcb

commit 0f17f9a888

110 changed files with 6424 additions and 1129 deletions

									
										src/Engine/Rendering/Renderer.cpp
									
		-1
	
												View File
												
				@@ -1,5 +1,4 @@

				#include "Rendering/Renderer.h"

				#include "Rendering/DebugCameraInputController.h"

				void Renderer::Initialize()

				{