diff options
| author | Chaosus | 2018-03-10 12:56:43 +0300 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-04-15 01:13:38 +0200 |
| commit | 3503ee4be643c10bbef95b08985c12937d0f1b12 (patch) | |
| tree | ebf0fd26d94a722984c6e4e7e502c6cd83ee9209 | |
| parent | 069b4297957a943c6d7e1dd7b5275b9d38d696c9 (diff) | |
| download | godot-3503ee4be643c10bbef95b08985c12937d0f1b12.tar.gz godot-3503ee4be643c10bbef95b08985c12937d0f1b12.tar.zst godot-3503ee4be643c10bbef95b08985c12937d0f1b12.zip | |
Fix invalid mix function overload
(cherry picked from commit 97bef8d9082da17dc1e3d1ee1956f01633f9fa31)
| -rw-r--r-- | servers/visual/shader_language.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 209c24c45..f5c926c09 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1611,7 +1611,7 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = { { "mix", TYPE_VEC3, { TYPE_VEC3, TYPE_VEC3, TYPE_VEC3, TYPE_VOID } }, { "mix", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_FLOAT, TYPE_VOID } }, { "mix", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_BOOL, TYPE_VOID } }, - { "mix", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_BVEC3, TYPE_VOID } }, + { "mix", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_BVEC4, TYPE_VOID } }, { "mix", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_VEC4, TYPE_VOID } }, { "step", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID } }, |