diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-13 08:43:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 08:43:07 +0100 |
| commit | 27a3447790db095cff4e723beecf16fa487f310c (patch) | |
| tree | 1b3d1f557af29917ca743494693a6da22a9092ba /servers | |
| parent | f3c79d8b6a2ce7f828a892a751b71653d6cbacec (diff) | |
| parent | 97bef8d9082da17dc1e3d1ee1956f01633f9fa31 (diff) | |
Merge pull request #17402 from Chaosus/fixmix
Fix invalid mix function overload
Diffstat (limited to 'servers')
| -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 209c24c45c..f5c926c093 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 } }, |