diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-17 14:16:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 14:16:56 +0200 |
| commit | 1d84c4f870c5ef7c83bdbaa111bb301612a75ebe (patch) | |
| tree | 8eccff1c5eba07ebe088b65eb0b5003685a00609 /servers/visual | |
| parent | 13a801430bdc9f8f739b951d5c54a1030795dcb9 (diff) | |
| parent | 7a74d310aac3bd980d1bffe9b3cd13de2539d356 (diff) | |
Merge pull request #20158 from Overblob/Fixed_shader_parsing_error_log
Fixed shader parsing error log
Diffstat (limited to 'servers/visual')
| -rw-r--r-- | servers/visual/shader_language.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 346b04f070..fd1eb77143 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2545,7 +2545,9 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons TkPos pos = _get_tkpos(); tk = _get_token(); - if (tk.type == TK_PERIOD) { + if (tk.type == TK_CURSOR) { + //do nothing + } else if (tk.type == TK_PERIOD) { StringName identifier; if (_get_completable_identifier(p_block, COMPLETION_INDEX, identifier)) { @@ -4130,8 +4132,8 @@ Error ShaderLanguage::complete(const String &p_code, const Map<StringName, Funct switch (completion_type) { case COMPLETION_NONE: { - //do none - return ERR_PARSE_ERROR; + //do nothing + return OK; } break; case COMPLETION_RENDER_MODE: { for (int i = 0; i < p_render_modes.size(); i++) { |