diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-08-23 20:15:56 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-23 20:15:56 -0300 |
| commit | 07e97414250827c3b930befa123a4bbd48d24861 (patch) | |
| tree | 8ec9872421ad333d3a1150ee64db1d0d27bd4269 /scene/resources/shader.h | |
| parent | 9d185ccc30ad5fe7eb716390ca2e7f5c06574ce0 (diff) | |
**WARNING BEFORE PULLING**
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)
Summary of Changes
-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
Diffstat (limited to 'scene/resources/shader.h')
| -rw-r--r-- | scene/resources/shader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/shader.h b/scene/resources/shader.h index b805cbec96..61a369c408 100644 --- a/scene/resources/shader.h +++ b/scene/resources/shader.h @@ -126,7 +126,7 @@ public: class ResourceFormatLoaderShader : 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; |