diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-11-02 20:25:01 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-11-02 20:25:01 +0300 |
| commit | 3b9868d2e44740c03861c64020a8b5d4d6da031d (patch) | |
| tree | 8ff5f9671122f946487848ce286d336c9b650c2c /drivers/pvr/texture_loader_pvr.h | |
| parent | dc8df8a91a995796f0f330bf6bb6b209f6dfce08 (diff) | |
| parent | b2f9acb8c96aed0505cbac21661e21e4acef710f (diff) | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'drivers/pvr/texture_loader_pvr.h')
| -rw-r--r-- | drivers/pvr/texture_loader_pvr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pvr/texture_loader_pvr.h b/drivers/pvr/texture_loader_pvr.h index ad86660aa1..735cb2b48b 100644 --- a/drivers/pvr/texture_loader_pvr.h +++ b/drivers/pvr/texture_loader_pvr.h @@ -9,7 +9,7 @@ class ResourceFormatPVR : public ResourceFormatLoader{ public: - virtual RES load(const String &p_path,const String& p_original_path); + virtual RES load(const String &p_path,const String& p_original_path,Error *r_error=NULL); 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; |