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

Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color

Browse Source 
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
This commit is contained in:
Saracen
2015-11-18 23:18:10 +00:00
parent c1d19ad258 94fdd01241
commit dd00452997
243 changed files with 4207 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
servers/visual/shader_language.cpp
View File

@@ -1043,6 +1043,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::vertex_builtins_defs[]={
{ "SRC_TANGENT", TYPE_VEC3},
{ "SRC_BINORMALF", TYPE_FLOAT},
{ "POSITION", TYPE_VEC4 },
{ "VERTEX", TYPE_VEC3},
{ "NORMAL", TYPE_VEC3},
{ "TANGENT", TYPE_VEC3},