Merge branch 'master' into DDS

Conflicts: assets src/Engine/Rendering/Texture.cpp src/Engine/Rendering/Util/CommonFunctions.cpp src/Game/Game.cpp
2016-03-10 19:55:25 +01:00
parent ffa9d7e607 012420b4da
commit d8f9f15d34
330 changed files with 95153 additions and 4985 deletions
@@ -11,7 +11,7 @@ class Texture : public BaseTexture
 {
 	friend class ResourceManager;

-private:
+protected:
 	Texture(std::string path);

 public: