From c85b1dc758afeb08ebae49f362b9997733720931 Mon Sep 17 00:00:00 2001 From: Saracen Date: Tue, 2 Feb 2021 17:13:33 +0000 Subject: [PATCH] Fix formatting --- editor/plugins/shader_editor_plugin.h | 2 +- servers/visual/shader_language.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h index 1f6d8cbc23c3..995c8a62ce25 100644 --- a/editor/plugins/shader_editor_plugin.h +++ b/editor/plugins/shader_editor_plugin.h @@ -130,7 +130,7 @@ class ShaderEditor : public PanelContainer { public: void apply_shaders(); - + static void refresh_shader_dependencies(); void ensure_select_current(); diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 12a430b688f9..d4f92436968f 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -30,13 +30,13 @@ #include "servers/visual/shader_language.h" #include "core/engine.h" +#include "core/io/resource_loader.h" #include "core/os/os.h" #include "core/print_string.h" -#include "servers/visual_server.h" -#include "core/io/resource_loader.h" -#include "servers/visual/shader_language.h" -#include "servers/visual/rasterizer.h" #include "scene/resources/shader.h" +#include "servers/visual/rasterizer.h" +#include "servers/visual/shader_language.h" +#include "servers/visual_server.h" static bool _is_text_char(CharType c) { @@ -4879,7 +4879,7 @@ Error ShaderLanguage::_parse_shader(const Map &p_funct int texture_uniforms = 0; int uniforms = 0; - + Set includes; int include_depth = 0; @@ -4907,9 +4907,9 @@ Error ShaderLanguage::_parse_shader(const Map &p_funct return ERR_PARSE_ERROR; } - String replacement = String("import \"") + tk.text + String("\""); + String replacement = String("import \"") + tk.text + String("\""); String empty; - for(int i = 0; i < replacement.size(); i++) { + for (int i = 0; i < replacement.size(); i++) { empty += " "; } code = code.replace_first(replacement, empty);