godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Style: apply clang-format (5.0.0) to current source

Browse Source
This commit is contained in:
Rémi Verschelde
2017-12-11 15:31:49 +01:00
parent 7e2d6b4450
commit 6a4e7198c5
147 changed files with 465 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
servers/visual/shader_language.cpp
View File

@@ -1952,7 +1952,7 @@ Error ShaderLanguage::parse_expression(Parser &parser, Node *p_parent, Node **r_
priority = 2;
break;
// shift left/right =2
// shift left/right =2
case TK_OP_LESS: priority = 4; break;
case TK_OP_LESS_EQUAL: priority = 4; break;
@@ -1964,16 +1964,16 @@ Error ShaderLanguage::parse_expression(Parser &parser, Node *p_parent, Node **r_
priority = 5;
break;
//bit and =5
//bit xor =6
//bit or=7
//bit and =5
//bit xor =6
//bit or=7
case TK_OP_AND: priority = 8; break;
case TK_OP_OR:
priority = 9;
break;
// ?: = 10
// ?: = 10
case TK_OP_ASSIGN_ADD: priority = 11; break;
case TK_OP_ASSIGN_SUB: priority = 11; break;