Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-25 18:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
This commit is contained in:
Juan Linietsky 2015-03-03 14:41:36 -03:00
commit 2c2894ceb6
151 changed files with 12123 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

1
servers/visual/shader_language.cpp
View file

@ -1112,6 +1112,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::ci_vertex_builtins_defs[]={
{ "SRC_VERTEX", TYPE_VEC2},
{ "VERTEX", TYPE_VEC2},
{ "WORLD_VERTEX", TYPE_VEC2},
{ "UV", TYPE_VEC2},
{ "COLOR", TYPE_VEC4},
{ "VAR1", TYPE_VEC4},