Merge branch 'master' into AsyncResourceLoad

# Conflicts: # include/Engine/Rendering/RawModel.h # src/Engine/Rendering/RenderQueueFactory.cpp
2016-01-15 10:10:57 +01:00
parent 71047b08ec 627108c6ee
commit 4cf6dcfc14
97 changed files with 3137 additions and 1891 deletions
@@ -46,6 +46,7 @@ public:
 	struct MaterialGroup
 	{
 		float Shininess;
+        float Transparency;
        std::string TexturePath;
 		std::shared_ptr<::Texture> Texture;
        std::string NormalMapPath;