AstralTransRocketries/mcedit
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with git@github.com:zothar/mcedit.git 'master'

Browse Source
This commit is contained in:
David Sowder 2012-03-21 17:41:57 -05:00
commit 343a9e4c70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
leveleditor.py
View File

@ -453,7 +453,7 @@ class CameraViewport(GLViewport):
GL.glReadBuffer(GL.GL_BACK) GL.glReadBuffer(GL.GL_BACK)
else: else:
GL.glReadBuffer(GL.GL_FRONT) GL.glReadBuffer(GL.GL_FRONT)
except Exception, e: except Exception:
logging.exception('Exception during glReadBuffer') logging.exception('Exception during glReadBuffer')
ws = self.get_root().size ws = self.get_root().size
if center: if center:
@ -3675,7 +3675,7 @@ class EditorToolbar(GLOrtho):
), dtype="f4")) ), dtype="f4"))
GL.glDrawArrays(GL.GL_QUADS, 0, 4) GL.glDrawArrays(GL.GL_QUADS, 0, 4)
except Exception, e: except Exception:
logging.exception('Error while drawing toolbar.') logging.exception('Error while drawing toolbar.')
GL.glDisableClientState(GL.GL_TEXTURE_COORD_ARRAY) GL.glDisableClientState(GL.GL_TEXTURE_COORD_ARRAY)