ソースを参照

Merge pull request #39870 from Chaosus/shader_fix_return_3.2

[3.2] Prevents usage of return in main shader functions
Rémi Verschelde 5 年 前
コミット
dafadfe6db
1 ファイル変更6 行追加0 行削除
  1. 6 0
      servers/visual/shader_language.cpp

+ 6 - 0
servers/visual/shader_language.cpp

@@ -4620,6 +4620,12 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
 
 			//check return type
 			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) {
 				b = b->parent_block;
 			}