asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20158 from Overblob/Fixed_shader_parsing_error_log

Browse source 
Fixed shader parsing error log
This commit is contained in:
Rémi Verschelde 2018-07-17 14:16:56 +02:00 committed by GitHub
commit 1d84c4f870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/visual/shader_language.cpp
View file

@ -2545,7 +2545,9 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
TkPos pos = _get_tkpos(); TkPos pos = _get_tkpos();
tk = _get_token(); tk = _get_token();
if (tk.type == TK_PERIOD) { if (tk.type == TK_CURSOR) {
//do nothing
} else if (tk.type == TK_PERIOD) {
StringName identifier; StringName identifier;
if (_get_completable_identifier(p_block, COMPLETION_INDEX, 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) { switch (completion_type) {
case COMPLETION_NONE: { case COMPLETION_NONE: {
//do none //do nothing
return ERR_PARSE_ERROR; return OK;
} break; } break;
case COMPLETION_RENDER_MODE: { case COMPLETION_RENDER_MODE: {
for (int i = 0; i < p_render_modes.size(); i++) { for (int i = 0; i < p_render_modes.size(); i++) {