From 0acaccebaf3b1dc6445f8a100a1011b89faa4216 Mon Sep 17 00:00:00 2001 From: bitsawer Date: Fri, 27 Jan 2023 14:35:20 +0200 Subject: Fix several shader preprocessor include issues --- servers/rendering/shader_preprocessor.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'servers/rendering/shader_preprocessor.cpp') diff --git a/servers/rendering/shader_preprocessor.cpp b/servers/rendering/shader_preprocessor.cpp index 816d937e9f..b45a7c0db3 100644 --- a/servers/rendering/shader_preprocessor.cpp +++ b/servers/rendering/shader_preprocessor.cpp @@ -674,6 +674,11 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) { return; } + path = path.simplify_path(); + if (path.is_relative_path()) { + path = state->current_filename.get_base_dir().path_join(path); + } + Ref res = ResourceLoader::load(path); if (res.is_null()) { set_error(RTR("Shader include load failed. Does the shader include exist? Is there a cyclic dependency?"), line); -- cgit v1.2.3