diff --git a/src/codechicken/lib/render/CCRenderPipeline.java b/src/codechicken/lib/render/CCRenderPipeline.java index b25141e..915cfc5 100644 --- a/src/codechicken/lib/render/CCRenderPipeline.java +++ b/src/codechicken/lib/render/CCRenderPipeline.java @@ -84,10 +84,8 @@ public class CCRenderPipeline if(CCRenderState.useNormals) addAttribute(CCRenderState.normalAttrib); - if(CCRenderState.baseColour != -1 || CCRenderState.alphaOverride >= 0) + if(CCRenderState.hasColour) addAttribute(CCRenderState.colourAttrib); - else if(CCRenderState.hasColour) - CCRenderState.setColour(-1); for(int i = 0; i < ops.size(); i++) { IVertexOperation op = ops.get(i); diff --git a/src/codechicken/lib/render/CCRenderState.java b/src/codechicken/lib/render/CCRenderState.java index 55a37c8..2c52fde 100644 --- a/src/codechicken/lib/render/CCRenderState.java +++ b/src/codechicken/lib/render/CCRenderState.java @@ -269,7 +269,8 @@ public class CCRenderState public static void reset() { model = null; pipeline.reset(); - hasNormal = hasColour = hasBrightness = false; + hasNormal = hasBrightness = false; + hasColour = true; baseColour = alphaOverride = -1; }