Merge branch 'release/1.9.x'

direct/src/showbase/ShowBase.py

@@ -528,9 +528,6 @@ class ShowBase(DirectObject.DirectObject):
             del self.winList
             del self.pipe
 
-        vfs = VirtualFileSystem.getGlobalPtr()
-        vfs.unmountAll()
-
     def makeDefaultPipe(self, printPipeTypes = True):
         """
         Creates the default GraphicsPipe, which will be used to make

panda/src/glstuff/glCgShaderContext_src.cxx

@@ -16,7 +16,8 @@
 
 #if defined(HAVE_CG) && !defined(OPENGLES)
 
-#include "Cg/cgGL.h"
+#include <Cg/cg.h>
+#include <Cg/cgGL.h>
 
 #include "pStatGPUTimer.h"
 

panda/src/glstuff/glCgShaderContext_src.h

@@ -21,8 +21,6 @@
 #include "shaderContext.h"
 #include "deletedChain.h"
 
-#include <Cg/cg.h>
-
 class CLP(GraphicsStateGuardian);
 
 ////////////////////////////////////////////////////////////////////