Merge branch 'master' into directx

Conflicts: include/Core/Engine.h
2015-10-20 15:13:20 +02:00
parent a4b9521c34 b4f098c80d
commit d197ec07ad
68 changed files with 3619 additions and 509 deletions
@@ -62,6 +62,7 @@ public:
 		if (m_Texture == nullptr) {
 			m_Texture = ResourceManager::Load<dd::Texture>("Textures/Core/ErrorTexture.png");
 		}
+
 		SizeToTexture();
 	}