Merge fixes and CapturePointHUD component skeleton added.

2016-02-10 20:58:10 +01:00
parent 2cae4e3fb2
commit f5de267f25
12 changed files with 87 additions and 95 deletions
@@ -50,7 +50,7 @@ public:
 	struct TextureProperties {
 		std::string TexturePath;
 		glm::vec2 UVRepeat;
-		std::shared_ptr<::Texture> Texture;	
+		Texture* Texture;	
 	};
 	
    struct MaterialBasic