diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-06-04 11:26:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-04 11:26:14 +0200 |
commit | 875ed4d600e6ae3a41841443a34ed4ede1c8e6fd (patch) | |
tree | ab2ffccce1654093fba800f09afc4e1ff821b5c9 /scene | |
parent | c33d444a546674572f3cfdcad47e1f990abb5390 (diff) | |
parent | b191a7547c0bc6b14ab7e37e7cd36d37ec6dc276 (diff) |
Merge pull request #47336 from Calinou/rename-shader-file-extension
Rename the `.shader` file extension to `.gdshader`
Diffstat (limited to 'scene')
-rw-r--r-- | scene/resources/shader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index 77c6199794..0ad21b0f0f 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -184,7 +184,7 @@ RES ResourceFormatLoaderShader::load(const String &p_path, const String &p_origi } void ResourceFormatLoaderShader::get_recognized_extensions(List<String> *p_extensions) const { - p_extensions->push_back("shader"); + p_extensions->push_back("gdshader"); } bool ResourceFormatLoaderShader::handles_type(const String &p_type) const { @@ -193,7 +193,7 @@ bool ResourceFormatLoaderShader::handles_type(const String &p_type) const { String ResourceFormatLoaderShader::get_resource_type(const String &p_path) const { String el = p_path.get_extension().to_lower(); - if (el == "shader") { + if (el == "gdshader") { return "Shader"; } return ""; @@ -224,7 +224,7 @@ Error ResourceFormatSaverShader::save(const String &p_path, const RES &p_resourc void ResourceFormatSaverShader::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const { if (const Shader *shader = Object::cast_to<Shader>(*p_resource)) { if (shader->is_text_shader()) { - p_extensions->push_back("shader"); + p_extensions->push_back("gdshader"); } } } |