diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-09 16:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-09 16:09:00 +0200 |
| commit | 5e495750a37e3314a8cd85cb3f7be9a676420c44 (patch) | |
| tree | e5497648bc2866bd74d66f84d791e28fa87f8698 /servers | |
| parent | 7f80c1dca8892cab4f4fe7a2daf6699755024f09 (diff) | |
| parent | 4083d0c78463643de75a566dcceefce527db3632 (diff) | |
Merge pull request #30457 from Chaosus/fix_not
Fix "not" shader function return type
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/shader_language.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 63b5f206f2..393c065b7d 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1918,9 +1918,9 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = { { "all", TYPE_BOOL, { TYPE_BVEC3, TYPE_VOID } }, { "all", TYPE_BOOL, { TYPE_BVEC4, TYPE_VOID } }, - { "not", TYPE_BOOL, { TYPE_BVEC2, TYPE_VOID } }, - { "not", TYPE_BOOL, { TYPE_BVEC3, TYPE_VOID } }, - { "not", TYPE_BOOL, { TYPE_BVEC4, TYPE_VOID } }, + { "not", TYPE_BVEC2, { TYPE_BVEC2, TYPE_VOID } }, + { "not", TYPE_BVEC3, { TYPE_BVEC3, TYPE_VOID } }, + { "not", TYPE_BVEC4, { TYPE_BVEC4, TYPE_VOID } }, //builtins - texture { "textureSize", TYPE_IVEC2, { TYPE_SAMPLER2D, TYPE_INT, TYPE_VOID } }, |