godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39870 from Chaosus/shader_fix_return_3.2 

[3.2] Prevents usage of return in main shader functions
This commit is contained in:
Rémi Verschelde 2020-06-27 17:14:35 +02:00 committed by GitHub
parent 3e3972db7a 891b84a833
commit dafadfe6db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/visual/shader_language.cpp
View File

@ -4620,6 +4620,12 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
//check return type //check return type
BlockNode *b = p_block; BlockNode *b = p_block;
if (b && b->parent_function && (b->parent_function->name == "vertex" || b->parent_function->name == "fragment" || b->parent_function->name == "light")) {
_set_error(vformat("Using 'return' in '%s' processor function results in undefined behavior!", b->parent_function->name));
return ERR_PARSE_ERROR;
}
while (b && !b->parent_function) { while (b && !b->parent_function) {
b = b->parent_block; b = b->parent_block;
} }