Browse Source

Fixed the internal color mask state not being updated when love.graphics.setColorMask is called.

Alex Szpakowski 10 years ago
parent
commit
b1f4beac56

+ 1 - 0
src/modules/graphics/opengl/Graphics.cpp

@@ -898,6 +898,7 @@ std::vector<Canvas *> Graphics::getCanvas() const
 void Graphics::setColorMask(ColorMask mask)
 void Graphics::setColorMask(ColorMask mask)
 {
 {
 	glColorMask(mask.r, mask.g, mask.b, mask.a);
 	glColorMask(mask.r, mask.g, mask.b, mask.a);
+	states.back().colorMask = mask;
 }
 }
 
 
 Graphics::ColorMask Graphics::getColorMask() const
 Graphics::ColorMask Graphics::getColorMask() const

+ 1 - 1
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -168,7 +168,7 @@ int w_stencil(lua_State *L)
 	instance()->drawToStencilBuffer(true);
 	instance()->drawToStencilBuffer(true);
 
 
 	// Call stencilfunc()
 	// Call stencilfunc()
-    lua_pushvalue(L, 1);
+	lua_pushvalue(L, 1);
 	lua_call(L, 0, 0);
 	lua_call(L, 0, 0);
 
 
 	instance()->drawToStencilBuffer(false);
 	instance()->drawToStencilBuffer(false);