TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-10-28 16:56:44 +01:00
commit 06475c70b9
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/showbase/ShowBase.py
View File

@ -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

3
panda/src/glstuff/glCgShaderContext_src.cxx
View File

@ -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"

2
panda/src/glstuff/glCgShaderContext_src.h
View File

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