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

Merge pull request #59774 from Chaosus/shader_fix

This commit is contained in:
Yuri Rubinsky 2022-04-01 21:37:44 +03:00 committed by GitHub
parent 1ec40a94d5 d47035a6fb
commit 9c5818d212
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
servers/rendering/shader_language.cpp
View File

@ -5134,9 +5134,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
}
} else if (tk.type == TK_PERIOD) {
completion_class = TAG_ARRAY;
p_block->block_tag = SubClassTag::TAG_ARRAY;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY;
}
call_expression = _parse_and_reduce_expression(p_block, p_function_info);
p_block->block_tag = SubClassTag::TAG_GLOBAL;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) {
return nullptr;
}
@ -5287,9 +5291,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (!expr->is_indexed() && expr->get_array_size() > 0) {
completion_class = TAG_ARRAY;
p_block->block_tag = SubClassTag::TAG_ARRAY;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY;
}
Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info);
p_block->block_tag = SubClassTag::TAG_GLOBAL;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) {
return nullptr;
}
@ -5587,9 +5595,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
mn->assign_expression = assign_expression;
} else if (tk.type == TK_PERIOD) {
completion_class = TAG_ARRAY;
p_block->block_tag = SubClassTag::TAG_ARRAY;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY;
}
Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info);
p_block->block_tag = SubClassTag::TAG_GLOBAL;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) {
return nullptr;
}