diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-06 21:15:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-06 21:15:13 -0300 |
| commit | e535c942f3c1b7e87a2971101192df5c259cdd30 (patch) | |
| tree | ae1066a4cf8ff4e2fdc23a356e5e1894fbe4ebab /core/io/resource_loader.cpp | |
| parent | 2b9cab25c08f9319fcb9d89262d8eda5618a89ee (diff) | |
| parent | c86f1f1737ee58dca9ad6c4ddb3b475fc005453a (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/io/resource_loader.cpp')
| -rw-r--r-- | core/io/resource_loader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index b547dc0e85..1bb80e74eb 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -319,7 +319,11 @@ Ref<ResourceInteractiveLoader> ResourceLoader::load_interactive(const String &p_ if (OS::get_singleton()->is_stdout_verbose()) print_line("load resource: "+local_path+" (cached)"); - return RES( ResourceCache::get(local_path ) ); + Ref<Resource> res_cached = ResourceCache::get(local_path); + Ref<ResourceInteractiveLoaderDefault> ril = Ref<ResourceInteractiveLoaderDefault>(memnew(ResourceInteractiveLoaderDefault)); + + ril->resource = res_cached; + return ril; } if (OS::get_singleton()->is_stdout_verbose()) |