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

Conflicts: modules/gdscript/gd_tokenizer.cpp scene/resources/shader_graph.h
2015-03-03 14:41:36 -03:00
parent 4d2198110b a0ee5cc353
commit 2c2894ceb6
151 changed files with 12123 additions and 954 deletions
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@ -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},