Fix Visual Studio 2015 compiler bug

Author: asarium

code/graphics/material.cpp

@@ -129,7 +129,10 @@ Fill_mode(GR_FILL_MODE_SOLID),
 Clr_scale(1.0f),
 Depth_bias(0)
 {
-	Clr = {{{ 1.0f, 1.0f, 1.0f, 1.0f }}};
+	Clr.xyzw.x = 1.0f;
+	Clr.xyzw.y = 1.0f; 
+	Clr.xyzw.z = 1.0f; 
+	Clr.xyzw.w = 1.0f;
 
 	Texture_maps[TM_BASE_TYPE]		= -1;
 	Texture_maps[TM_GLOW_TYPE]		= -1;
@@ -321,7 +324,10 @@ int material::get_depth_bias()
 
 void material::set_color(float red, float green, float blue, float alpha)
 {
-	Clr = {{{ red, green, blue, alpha }}};
+	Clr.xyzw.x = red;
+	Clr.xyzw.y = green;
+	Clr.xyzw.z = blue;
+	Clr.xyzw.w = alpha;
 }
 
 void material::set_color(int r, int g, int b, int a)
@@ -331,15 +337,24 @@ void material::set_color(int r, int g, int b, int a)
 	CLAMP(g, 0, 255);
 	CLAMP(a, 0, 255);
 
-	Clr = {{{ i2fl(r) / 255.0f, i2fl(g) / 255.0f, i2fl(b) / 255.0f, i2fl(a) / 255.0f }}};
+	Clr.xyzw.x = i2fl(r) / 255.0f;
+	Clr.xyzw.y = i2fl(g) / 255.0f;
+	Clr.xyzw.z = i2fl(b) / 255.0f;
+	Clr.xyzw.w = i2fl(a) / 255.0f;
 }
 
 void material::set_color(color &clr_in)
 {
 	if ( clr_in.is_alphacolor ) {
-		Clr = {{{ i2fl(clr_in.red) / 255.0f, i2fl(clr_in.green) / 255.0f, i2fl(clr_in.blue) / 255.0f, 1.0f }}};
+		Clr.xyzw.x = i2fl(clr_in.red) / 255.0f;
+		Clr.xyzw.y = i2fl(clr_in.green) / 255.0f;
+		Clr.xyzw.z = i2fl(clr_in.blue) / 255.0f;
+		Clr.xyzw.w = 1.0f;
 	} else {
-		Clr = {{{ i2fl(clr_in.red) / 255.0f, i2fl(clr_in.green) / 255.0f, i2fl(clr_in.blue) / 255.0f, i2fl(clr_in.green) / 255.0f }}};
+		Clr.xyzw.x = i2fl(clr_in.red) / 255.0f;
+		Clr.xyzw.y = i2fl(clr_in.green) / 255.0f;
+		Clr.xyzw.z = i2fl(clr_in.blue) / 255.0f;
+		Clr.xyzw.w = i2fl(clr_in.green) / 255.0f;
 	}
 }
 
@@ -666,7 +681,11 @@ shield_material::shield_material() :
 	set_shader_type(SDR_TYPE_SHIELD_DECAL);
 
 	vm_set_identity(&Impact_orient);
-	Impact_pos = {{{ 0.0f, 0.0f, 0.0f }}};
+
+	Impact_pos.xyz.x = 0.0f;
+	Impact_pos.xyz.y = 0.0f;
+	Impact_pos.xyz.z = 0.0f;
+
 	Impact_radius = 1.0f;
 }