asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #73975 from bitsawer/fix_preprocessor_include_check

Browse source 
Fix shader preprocessor include resource check
This commit is contained in:
Rémi Verschelde 2023-02-26 14:26:31 +01:00
commit ad32b22bde
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/rendering/shader_preprocessor.cpp
View file

@ -679,6 +679,11 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
path = state->current_filename.get_base_dir().path_join(path); path = state->current_filename.get_base_dir().path_join(path);
} }
if (!ResourceLoader::exists(path)) {
set_error(RTR("Shader include file does not exist: ") + path, line);
return;
}
Ref<Resource> res = ResourceLoader::load(path); Ref<Resource> res = ResourceLoader::load(path);
if (res.is_null()) { if (res.is_null()) {
set_error(RTR("Shader include load failed. Does the shader include exist? Is there a cyclic dependency?"), line); set_error(RTR("Shader include load failed. Does the shader include exist? Is there a cyclic dependency?"), line);