From 1c49c2a2ad7abc4991f807c8d52786dcec4a6340 Mon Sep 17 00:00:00 2001 From: Hubry Date: Wed, 1 Jan 2020 15:08:24 +0100 Subject: [PATCH] Minor cleanup of the particle fix to avoid push/pop attrib --- src/main/java/vazkii/botania/client/fx/FXSparkle.java | 3 --- src/main/java/vazkii/botania/client/fx/FXWisp.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 3c687460a..8ecb86a07 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -174,7 +174,6 @@ public class FXSparkle extends Particle { } private static void beginRenderCommon(BufferBuilder buffer, TextureManager textureManager) { - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.depthMask(false); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); @@ -187,10 +186,8 @@ public class FXSparkle extends Particle { private static void endRenderCommon() { GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); - GlStateManager.enableLighting(); GlStateManager.disableBlend(); GlStateManager.depthMask(true); - GL11.glPopAttrib(); } private static final IParticleRenderType NORMAL_RENDER = new IParticleRenderType() { diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index b9c6a5d1b..fbbc30aec 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -112,7 +112,6 @@ public class FXWisp extends Particle { } private static void beginRenderCommon(BufferBuilder bufferBuilder, TextureManager textureManager) { - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.depthMask(false); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); @@ -126,10 +125,8 @@ public class FXWisp extends Particle { private static void endRenderCommon() { GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); - GlStateManager.enableLighting(); GlStateManager.disableBlend(); GlStateManager.depthMask(true); - GL11.glPopAttrib(); } private static final IParticleRenderType NORMAL_RENDER = new IParticleRenderType() {