tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Removed overly defensive code and ensure GL state to be restored.

Browse source 
Fixes #1673
This commit is contained in:
yueh 2015-07-04 17:30:54 +02:00
parent 3844f3af87
commit 3f013c8d1d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
View file

@ -349,7 +349,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
GL11.glRotatef( 180.0f, 0.0f, 1.0f, 0.0f ); GL11.glRotatef( 180.0f, 0.0f, 1.0f, 0.0f );
} }
GL11.glPushMatrix(); // GL11.glPushMatrix();
try try
{ {
final ItemStack sis = ais.getItemStack(); final ItemStack sis = ais.getItemStack();
@ -373,8 +373,13 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
{ {
AELog.error( e ); 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.glTranslatef( 0.0f, 0.14f, -0.24f );
GL11.glScalef( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f ); GL11.glScalef( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );