From 8178fb21f334657a57f25d707cc592d68d29aa9b Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 11 Aug 2020 09:40:34 +0200 Subject: [PATCH] direct: don't rely on vfs being present in builtins --- direct/src/distributed/ConnectionRepository.py | 1 + direct/src/distributed/ServerRepository.py | 1 + direct/src/particles/ParticleEffect.py | 1 + 3 files changed, 3 insertions(+) diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py index 348a4390b6..d77802c7ff 100644 --- a/direct/src/distributed/ConnectionRepository.py +++ b/direct/src/distributed/ConnectionRepository.py @@ -260,6 +260,7 @@ class ConnectionRepository( searchPath = getModelPath().getValue() for dcFileName in dcFileNames: pathname = Filename(dcFileName) + vfs = VirtualFileSystem.getGlobalPtr() vfs.resolveFilename(pathname, searchPath) readResult = dcFile.read(pathname) if not readResult: diff --git a/direct/src/distributed/ServerRepository.py b/direct/src/distributed/ServerRepository.py index ac0f2c6856..6e0ef837a0 100644 --- a/direct/src/distributed/ServerRepository.py +++ b/direct/src/distributed/ServerRepository.py @@ -225,6 +225,7 @@ class ServerRepository: searchPath = getModelPath().getValue() for dcFileName in dcFileNames: pathname = Filename(dcFileName) + vfs = VirtualFileSystem.getGlobalPtr() vfs.resolveFilename(pathname, searchPath) readResult = dcFile.read(pathname) if not readResult: diff --git a/direct/src/particles/ParticleEffect.py b/direct/src/particles/ParticleEffect.py index f2c2141614..82f0904715 100644 --- a/direct/src/particles/ParticleEffect.py +++ b/direct/src/particles/ParticleEffect.py @@ -201,6 +201,7 @@ class ParticleEffect(NodePath): f.write('self.addForceGroup(%s)\n' % target) def loadConfig(self, filename): + vfs = VirtualFileSystem.getGlobalPtr() data = vfs.readFile(filename, 1) data = data.replace(b'\r', b'') try: