Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update copyright statements to 2020

Browse source 
And apply clang-format 10 to the codebase.
This commit is contained in:
Rémi Verschelde 2020-08-13 22:58:13 +02:00
parent 18484dd45e
commit b97401f304
1447 changed files with 5601 additions and 3131 deletions
Download patch file Download diff file Expand all files Collapse all files

14
servers/visual/shader_language.cpp
View file

@ -5,8 +5,8 @@
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
@ -27,6 +27,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "shader_language.h"
#include "os/os.h"
#include "print_string.h"
@ -1441,7 +1442,8 @@ ShaderLanguage::Node *ShaderLanguage::validate_operator(Parser &parser, Operator
_RCO2(OP_CMP_GREATER, Variant::OP_GREATER);
_RCO2(OP_CMP_OR, Variant::OP_OR);
_RCO2(OP_CMP_AND, Variant::OP_AND);
default: {}
default: {
}
}
}
@ -1864,7 +1866,8 @@ Error ShaderLanguage::parse_expression(Parser &parser, Node *p_parent, Node **r_
ok = (ident == "x" || ident == "y" || ident == "z" || ident == "w");
member_type = TYPE_VEC4;
break;
default: {}
default: {
}
}
if (!ok) {
@ -2250,7 +2253,8 @@ Error ShaderLanguage::parse_variable_declaration(Parser &parser, BlockNode *p_bl
case TYPE_MAT4: con->value = Transform(); break;
case TYPE_TEXTURE:
case TYPE_CUBEMAP: con->value = RID(); break;
default: {}
default: {
}
}
if (uniform) {