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

Fix custom res caching sub-res even if no-cache

Browse Source 
Fixes #59686, fixes #59752
This commit is contained in:
Francois Belair
2022-06-25 15:51:37 -04:00
parent 928c488888
commit 2ceb93bbef
51 changed files with 112 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/etc/texture_loader_pkm.cpp
View File

@@ -42,7 +42,7 @@ struct ETC1Header {
uint16_t origHeight;
};
RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error) {
RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_no_subresource_cache) {
if (r_error) {
*r_error = ERR_CANT_OPEN;
}

2
modules/etc/texture_loader_pkm.h
View File

@@ -36,7 +36,7 @@
class ResourceFormatPKM : 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;