Merge pull request #57091 from Chaosus/fix_unused_localvar_warnings

2022-01-23 21:25:37 +03:00
parent dda6d2674a 3ca57e5157
commit dc5fbfdbdc
1 changed files with 8 additions and 2 deletions
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -5208,9 +5208,15 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 #ifdef DEBUG_ENABLED
 				if (check_warnings) {
 					StringName func_name;
+					BlockNode *b = p_block;

-					if (p_block && p_block->parent_function) {
-						func_name = p_block->parent_function->name;
+					while (b) {
+						if (b->parent_function) {
+							func_name = b->parent_function->name;
+							break;
+						} else {
+							b = b->parent_block;
+						}
 					}

 					_parse_used_identifier(identifier, ident_type, func_name);