diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-04-19 23:19:21 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-04-20 21:21:58 -0300 |
| commit | ae09b55a19c956cf6dafd446c71178f6bbffd91d (patch) | |
| tree | 94c9b2cc850eb2fb0608a52c05fb389e1cd35234 /scene/resources/shader.cpp | |
| parent | 6d8e1aea892dc80e2fb01729b9a532a447f0760d (diff) | |
| download | redot-engine-ae09b55a19c956cf6dafd446c71178f6bbffd91d.tar.gz | |
Exposed RenderingDevice to script API
Also added an easier way to load native GLSL shaders.
Extras:
Had to fix no-cache for subresources in resource loader, it was not properly working, making shaders not properly reload.
Note:
The precommit hooks are broken because they don't seem to support enums from one class being used in another.
Feel free to fix this after merging this PR.
Diffstat (limited to 'scene/resources/shader.cpp')
| -rw-r--r-- | scene/resources/shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index a62e7ded16..1ac2f7c3c9 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -176,7 +176,7 @@ Shader::~Shader() { } //////////// -RES ResourceFormatLoaderShader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { +RES ResourceFormatLoaderShader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { if (r_error) *r_error = ERR_FILE_CANT_OPEN; |