1 files changed, 4 insertions, 8 deletions

diff --git a/src/extras/custompipes_gl.cpp b/src/extras/custompipes_gl.cpp
index 2b28cb52..d74e40db 100644
--- a/src/extras/custompipes_gl.cpp
+++ b/src/extras/custompipes_gl.cpp
@@ -128,9 +128,10 @@ vehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 		inst++;
 	}
 
-	SetRenderState(SRCBLEND, BLENDSRCALPHA);
 	setTexture(1, nil);
 
+	SetRenderState(SRCBLEND, BLENDSRCALPHA);
+
 	teardownVertexInput(header);
 }
 
@@ -255,10 +256,10 @@ CreateWorldPipe(void)
 		ReadTweakValueTable((char*)work_buff, WorldLightmapBlend);
 
 	{
-#include "shaders/obj/neoWorldIII_frag.inc"
+#include "shaders/obj/neoWorldVC_frag.inc"
 #include "shaders/obj/default_UV2_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, default_UV2_vert_src, nil };
-	const char *fs[] = { shaderDecl, header_frag_src, neoWorldIII_frag_src, nil };
+	const char *fs[] = { shaderDecl, header_frag_src, neoWorldVC_frag_src, nil };
 	neoWorldShader = Shader::create(vs, fs);
 	assert(neoWorldShader);
 	}
@@ -595,7 +596,6 @@ struct BuildingInst
 {
 	rw::Matrix matrix;
 	rw::gl3::InstanceDataHeader *instHeader;
-	uint32 cullMode;
 	uint8 fadeAlpha;
 	bool lighting;
 };
@@ -628,7 +628,6 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 	assert(building->instHeader->platform == PLATFORM_GL3);
 	building->fadeAlpha = 255;
 	building->lighting = !!(atomic->geometry->flags & rw::Geometry::LIGHT);
-	building->cullMode = rw::GetRenderState(rw::CULLMODE);
 	rw::uint32 flags = atomic->geometry->flags;
 
 	WorldLights lights;
@@ -656,7 +655,6 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 
 		// alright we're rendering this atomic
 		if(!setupDone){
-			rw::SetRenderState(rw::CULLMODE, building->cullMode);
 			defaultShader->use();
 			setWorldMatrix(&building->matrix);
 			setupVertexInput(building->instHeader);
@@ -689,7 +687,6 @@ AtomicFullyTransparent(RpAtomic *atomic, int pass, int fadeAlpha)
 	assert(building->instHeader->platform == PLATFORM_GL3);
 	building->fadeAlpha = fadeAlpha;
 	building->lighting = !!(atomic->geometry->flags & rw::Geometry::LIGHT);
-	building->cullMode = rw::GetRenderState(rw::CULLMODE);
 	building->matrix = *atomic->getFrame()->getLTM();
 	numBlendInsts[pass]++;
 }
@@ -710,7 +707,6 @@ RenderBlendPass(int pass)
 	for(i = 0; i < numBlendInsts[pass]; i++){
 		BuildingInst *building = &blendInsts[pass][i];
 
-		rw::SetRenderState(rw::CULLMODE, building->cullMode);
 		setupVertexInput(building->instHeader);
 		setWorldMatrix(&building->matrix);
 		if(building->lighting)