Fixed blendmaps

Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Components/BlendMap.h

@@ -9,12 +9,14 @@ namespace Components
 	struct BlendMap : Component
 	{
 		BlendMap() 
-			: TextureRed("Textures/Ground/Asphalt")
-			, TextureGreen("Textures/Ground/Grass")
-			, TextureBlue("Textures/Ground/Sand")
+			: TextureRed("Textures/ErrorTextureRed.png")
+			, TextureGreen("Textures/ErrorTextureGreen.png")
+			, TextureBlue("Textures/ErrorTextureBlue.png")
 			, TextureRepeats(100.f) { }
 
-		std::string TextureRed, TextureGreen, TextureBlue;
+		std::string TextureRed;
+		std::string	TextureGreen;
+		std::string	TextureBlue;
 		float TextureRepeats;
 
 		virtual BlendMap* Clone() const override { return new BlendMap(*this); }

src/Components/Health.h

@@ -9,9 +9,9 @@ namespace Components
 	struct Health : Component
 	{
 		Health()
-			: health(1.0f){ }
+			: Amount(1.0f) { }
 
-		float health;
+		float Amount;
 
 		virtual Health* Clone() const override { return new Health(*this); }
 	};