From e48b910382ba1a796e58d683848a4ef666104ce2 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 27 Oct 2015 13:00:29 +0100
Subject: [PATCH 1/2] Don't umount all filesystems when ShowBase is destroyed

---
 direct/src/showbase/ShowBase.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index e6c0f623e4..6c6c68d4a8 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -533,9 +533,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

From fe633b51a127e0947efc8a1ec1d3402d09362d01 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 28 Oct 2015 15:55:59 +0100
Subject: [PATCH 2/2] Remove unnecessary cg.h include

---
 panda/src/glstuff/glCgShaderContext_src.cxx | 3 ++-
 panda/src/glstuff/glCgShaderContext_src.h   | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/panda/src/glstuff/glCgShaderContext_src.cxx b/panda/src/glstuff/glCgShaderContext_src.cxx
index 4afda4b921..10a6bc3119 100644
--- a/panda/src/glstuff/glCgShaderContext_src.cxx
+++ b/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"
 
diff --git a/panda/src/glstuff/glCgShaderContext_src.h b/panda/src/glstuff/glCgShaderContext_src.h
index 16dd9bcdb2..6d4a74c795 100644
--- a/panda/src/glstuff/glCgShaderContext_src.h
+++ b/panda/src/glstuff/glCgShaderContext_src.h
@@ -21,8 +21,6 @@
 #include "shaderContext.h"
 #include "deletedChain.h"
 
-#include <Cg/cg.h>
-
 class CLP(GraphicsStateGuardian);
 
 ////////////////////////////////////////////////////////////////////