[GRASS-SVN] r36968 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-03 08:25:53 -0400 (Sun, 03 May 2009)
New Revision: 36968

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py
Log:
glynn: Remove PyOpenGL references
      (merge from trunk, r33474)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2009-05-03 11:05:22 UTC (rev 36967)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2009-05-03 12:25:53 UTC (rev 36968)
@@ -2796,11 +2796,6 @@
                         "included with this build "
                         "of wxPython! Switching back to "
                         "2D display mode.\n\nDetails: %s" % nviz.errorMsg)
-            if not nviz.haveOpenGL:
-                msg = _("Unable to start Nviz. The OpenGL package "
-                        "was not found. You can get it "
-                        "at http://PyOpenGL.sourceforge.net. "
-                        "Switching back to 2D display mode.\n\nDetails: %s" % nviz.errorMsg)
             if not nviz.haveNviz:
                 msg = _("Unable to start Nviz. Python extension "
                         "for Nviz was not found or loaded properly. "

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py	2009-05-03 11:05:22 UTC (rev 36967)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py	2009-05-03 12:25:53 UTC (rev 36968)
@@ -29,13 +29,6 @@
 except ImportError, e:
     haveGLCanvas = False
     errorMsg = e
-try:
-    from OpenGL.GL import *
-    from OpenGL.GLUT import *
-    haveOpenGL = True
-except ImportError, e:
-    haveOpenGL = False
-    errorMsg = e
 
 import globalvar
 try: