summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell D. Fish <fish@cs.utah.edu>2008-12-28 01:21:40 +0000
committerRussell D. Fish <fish@cs.utah.edu>2008-12-28 01:21:40 +0000
commitbf84f2d52ec94d08481831ac2352aedbc977eb79 (patch)
tree91b76c6025a03a7cf743bc2490ca5978dadf2fa0
parentf34c9c83f4d7aa4aa51e1583b37f42536c9676df (diff)
downloadnanoengineer-bf84f2d52ec94d08481831ac2352aedbc977eb79.tar.gz
nanoengineer-bf84f2d52ec94d08481831ac2352aedbc977eb79.zip
Add back the no-oped gleGetNumSides and gleSetNumSides as a mostly-harmless last resort.
-rw-r--r--cad/src/graphics/drawing/gl_GLE.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/cad/src/graphics/drawing/gl_GLE.py b/cad/src/graphics/drawing/gl_GLE.py
index 5f9ceee28..7aef22304 100644
--- a/cad/src/graphics/drawing/gl_GLE.py
+++ b/cad/src/graphics/drawing/gl_GLE.py
@@ -32,3 +32,14 @@ if not bool(gleGetNumSides):
print "fyi: Patching gleGetNumSides to call gleGetNumSlices instead."
from graphics.drawing.gleNumSides_patch import gleGetNumSides
from graphics.drawing.gleNumSides_patch import gleSetNumSides
+
+ # russ 081227: The no-ops may still be needed, e.g. on Fedora 10 Linux.
+ try:
+ gleGetNumSides()
+ except:
+ print "fyi: Neither gleGetNumSides nor gleGetNumSlices is supported."
+ print "fyi: No-ops will be used for gleGetNumSides and gleSetNumSides."
+ gleGetNumSides = int
+ gleSetNumSides = int
+ pass
+ pass