godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62408 from Razoric480/raz/fix-no-cache

Browse Source 
[3.x] Fix nested resources being cached if no-cache argument used
This commit is contained in:
Rémi Verschelde
2022-08-05 23:43:54 +02:00
committed by GitHub
parent d9d3861f76 2ceb93bbef
commit 14c9325b5d
51 changed files with 112 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/theora/video_stream_theora.cpp
View File

@@ -689,7 +689,7 @@ void VideoStreamTheora::_bind_methods() {
////////////
RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_original_path, Error *r_error) {
RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_no_subresource_cache) {
FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
if (!f) {
if (r_error) {

2
modules/theora/video_stream_theora.h
View File

@@ -186,7 +186,7 @@ public:
class ResourceFormatLoaderTheora : public ResourceFormatLoader {
public:
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr);
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_no_subresource_cache = false);
virtual void get_recognized_extensions(List<String> *p_extensions) const;
virtual bool handles_type(const String &p_type) const;
virtual String get_resource_type(const String &p_path) const;