Browse Source

Fixed love.graphics.setShader with no arguments not properly restoring the default shader.

--HG--
branch : minor
Alex Szpakowski 11 years ago
parent
commit
3f208f1e60
1 changed files with 8 additions and 0 deletions
  1. 8 0
      src/modules/graphics/opengl/Shader.cpp

+ 8 - 0
src/modules/graphics/opengl/Shader.cpp

@@ -429,6 +429,14 @@ void Shader::attach(bool temporary)
 
 
 void Shader::detach()
 void Shader::detach()
 {
 {
+	if (defaultShader)
+	{
+		if (current != defaultShader)
+			defaultShader->attach();
+
+		return;
+	}
+
 	if (current != nullptr)
 	if (current != nullptr)
 		glUseProgram(0);
 		glUseProgram(0);