1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00

-fixed issue with shader not being reset on layers, closes #1199

-ability for shader to use parent shader and params, closes #1198
This commit is contained in:
Juan Linietsky
2015-01-12 20:44:02 -03:00
parent 544ce2a1db
commit 30d3658110
11 changed files with 81 additions and 35 deletions

View File

@@ -1120,8 +1120,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::ci_vertex_builtins_defs[]={
//builtins
{ "WORLD_MATRIX", TYPE_MAT4},
{ "PROJECTION_MATRIX", TYPE_MAT4},
{ "EXTRA_MATRIX", TYPE_MAT4},
{ "MODELVIEW_MATRIX", TYPE_MAT4},
{ "EXTRA_MATRIX", TYPE_MAT4},
{ "TIME", TYPE_FLOAT},
{ NULL, TYPE_VOID},
};