diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-24 21:33:00 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-24 21:33:00 -0300 |
| commit | 54291c655db3346aedb875b3c375c0f759d90043 (patch) | |
| tree | a188d763d25ceb0b1d12590f1f6f71633c4a79c7 /drivers/chibi/event_stream_chibi.h | |
| parent | 3a83337420c3e6c7e5f3a52cee49aa2eb17cab2d (diff) | |
| parent | 0d77277a860f56b5f596c3d930ec2209cee95517 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/chibi/event_stream_chibi.h')
| -rw-r--r-- | drivers/chibi/event_stream_chibi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/chibi/event_stream_chibi.h b/drivers/chibi/event_stream_chibi.h index 7b2ee4b471..b564c16018 100644 --- a/drivers/chibi/event_stream_chibi.h +++ b/drivers/chibi/event_stream_chibi.h @@ -301,7 +301,7 @@ public: class ResourceFormatLoaderChibi : 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; |