Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

This commit is contained in:
SpaceToad 2014-06-10 13:22:55 +02:00
commit 0ad90d29ce

View file

@ -206,9 +206,7 @@ public final class RenderEntityBlock extends Render {
realDoLight = false;
}
// TODO: needs to cancel the test because the variable is now private... May need to
// duplicate the tessellator code.
//if (doTessellating && !tessellator.isDrawing)
if (doTessellating)
tessellator.startDrawingQuads();
float light = 0;
@ -280,9 +278,7 @@ public final class RenderEntityBlock extends Render {
renderBlocks.renderFaceXPos(info.baseBlock, x, y, z, info.getBlockTextureFromSide(5));
}
// TODO: needs to cancel the test because the variable is now private... May need to
// duplicate the tessellator code.
//if (doTessellating && tessellator.isDrawing)
tessellator.draw();
if (doTessellating)
tessellator.draw();
}
}