fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1678 from yueh/fix-1673

Browse Source 
Removed overly defensive code and ensure GL state to be restored.
This commit is contained in:
yueh
2015-07-14 21:30:03 +02:00
parent 49321d72c1 3f013c8d1d
commit 3fb3f70392
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+7 -2
View File
@@ -349,7 +349,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();
@@ -373,8 +373,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 );