Browse Source

Hopefully fixed compilation when VS2013 is used...

Alex Szpakowski 10 years ago
parent
commit
68bb0c97bc
2 changed files with 9 additions and 1 deletions
  1. 8 0
      src/modules/graphics/Graphics.h
  2. 1 1
      src/modules/graphics/opengl/Graphics.h

+ 8 - 0
src/modules/graphics/Graphics.h

@@ -134,6 +134,14 @@ public:
 	{
 		bool r, g, b, a;
 
+		ColorMask()
+			: r(true), g(true), b(true), a(true)
+		{}
+
+		ColorMask(bool _r, bool _g, bool _b, bool _a)
+			: r(_r), g(_g), b(_b), a(_a)
+		{}
+
 		bool operator == (const ColorMask &m) const
 		{
 			return r == m.r && g == m.g && b == m.b && a == m.a;

+ 1 - 1
src/modules/graphics/opengl/Graphics.h

@@ -487,7 +487,7 @@ private:
 
 		std::vector<StrongRef<Canvas>> canvases;
 
-		ColorMask colorMask = {true, true, true, true};
+		ColorMask colorMask = ColorMask(true, true, true, true);
 
 		bool wireframe = false;