From 1fb49dc3f7893cdb4ffd9a18fbbbffde978da595 Mon Sep 17 00:00:00 2001 From: Ed Swartz Date: Thu, 7 May 2015 15:32:13 -0500 Subject: [PATCH] Fix Rocket asset lookup to use VFS correctly for .p3d --- panda/src/rocket/rocketFileInterface.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/rocket/rocketFileInterface.cxx b/panda/src/rocket/rocketFileInterface.cxx index 04bc27c96a..ba519760f9 100644 --- a/panda/src/rocket/rocketFileInterface.cxx +++ b/panda/src/rocket/rocketFileInterface.cxx @@ -42,7 +42,7 @@ Open(const Rocket::Core::String& path) { PT(VirtualFile) file = _vfs->get_file(fn); if (file == NULL) { // failed? Try model-path as a Panda-friendly fallback. - if (!fn.resolve_filename(get_model_path())) { + if (!_vfs->resolve_filename(fn, get_model_path())) { rocket_cat.error() << "Could not resolve " << fn << " along the model-path (currently: " << get_model_path() << ")\n"; return (Rocket::Core::FileHandle) NULL;