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

support loading icons through the VFS

Browse Source
This commit is contained in:
rdb 2012-03-13 17:35:28 +00:00
parent c8c7ea5dfb
commit ea3b967f8a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -1883,8 +1883,9 @@ get_cursor(const Filename &filename) {
} }
// If it wasn't found, resolve the filename and search for that. // If it wasn't found, resolve the filename and search for that.
Filename resolved = filename; VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
if (!resolved.resolve_filename(get_model_path())) { Filename resolved (filename);
if (!vfs->resolve_filename(resolved, get_model_path())) {
// The filename doesn't exist. // The filename doesn't exist.
x11display_cat.warning() x11display_cat.warning()
<< "Could not find cursor filename " << filename << "\n"; << "Could not find cursor filename " << filename << "\n";
@ -1897,7 +1898,6 @@ get_cursor(const Filename &filename) {
} }
// Open the file through the virtual file system. // Open the file through the virtual file system.
VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
istream *str = vfs->open_read_file(resolved, true); istream *str = vfs->open_read_file(resolved, true);
if (str == NULL) { if (str == NULL) {
x11display_cat.warning() x11display_cat.warning()