From d866b6c1675b7244b18f644097a1584191d1bff8 Mon Sep 17 00:00:00 2001 From: yueh Date: Sat, 4 Jul 2015 17:30:54 +0200 Subject: [PATCH] Removed overly defensive code and ensure GL state to be restored. Fixes #1673 --- .../java/appeng/parts/reporting/AbstractPartMonitor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 0ee5fa80..fb2252da 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -350,7 +350,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements GL11.glRotatef( 180.0f, 0.0f, 1.0f, 0.0f ); } - GL11.glPushMatrix(); + // GL11.glPushMatrix(); try { final ItemStack sis = ais.getItemStack(); @@ -374,8 +374,13 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements { AELog.error( e ); } + finally + { + GL11.glEnable( GL11.GL_LIGHTING ); + GL11.glEnable( GL12.GL_RESCALE_NORMAL ); + } - GL11.glPopMatrix(); + // GL11.glPopMatrix(); GL11.glTranslatef( 0.0f, 0.14f, -0.24f ); GL11.glScalef( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );