diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-12 20:44:02 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-12 20:44:02 -0300 |
| commit | 30d36581100f0bf71c6d2502be9a03443bdf8708 (patch) | |
| tree | 2ac0ce5967e150269a71bece0ea0bd16c3eb1054 /servers/visual/shader_language.cpp | |
| parent | 544ce2a1dbaa5548490c975c2f6f6ed7c21377b9 (diff) | |
| download | redot-engine-30d36581100f0bf71c6d2502be9a03443bdf8708.tar.gz | |
-fixed issue with shader not being reset on layers, closes #1199
-ability for shader to use parent shader and params, closes #1198
Diffstat (limited to 'servers/visual/shader_language.cpp')
| -rw-r--r-- | servers/visual/shader_language.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 80f82fdc42..f5bff29f47 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -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}, }; |