X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=673fa701e6cb6c5d5860648bab880cda117a2a87;hp=66188d910c085f9ecafffae6467c43358393d95d;hb=8e063e6def7412f85a26f829b641f28d3476062f;hpb=c4d81a13ca8ac1479eca78ee190f3762ef3cbec4

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 66188d91..673fa701 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -135,7 +135,7 @@ void PipelineState::apply(unsigned mask) const
 	{
 		glFrontFace(front_face==CLOCKWISE ? GL_CW : GL_CCW);
 
-		if(face_cull!=NO_CULL)
+		if(face_cull!=NO_CULL && front_face!=NON_MANIFOLD)
 		{
 			glEnable(GL_CULL_FACE);
 			glCullFace(face_cull==CULL_FRONT ? GL_FRONT : GL_BACK);
@@ -188,7 +188,7 @@ void PipelineState::apply(unsigned mask) const
 		}
 
 		for(vector<BoundTexture>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
-			if(i->changed)
+			if(i->changed || mask==~0U)
 			{
 				if(i->texture && i->sampler)
 				{
@@ -245,7 +245,7 @@ void PipelineState::apply(unsigned mask) const
 		}
 
 		for(vector<BoundUniformBlock>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-			if(i->changed)
+			if(i->changed || mask==~0U)
 			{
 				if(i->block)
 				{