diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-25 11:13:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 11:13:27 +0200 |
| commit | 3084a48ace3e7dabd83e4c62280328f429defad6 (patch) | |
| tree | 1390e9c68aea9b9ab8802b8e3d82605997f7eb95 /scene/main | |
| parent | cc09dc92c8ee06255a158d81533d35c6d2e8d31e (diff) | |
| parent | 455c06ecd466424cdf1b444a7c289b322390e795 (diff) | |
Merge pull request #63219 from reduz/implement-vector4-projection
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/shader_globals_override.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index 0049359cad..3b6055fcf7 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -155,7 +155,7 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const pinfo.type = Variant::VECTOR3; } break; case RS::GLOBAL_VAR_TYPE_VEC4: { - pinfo.type = Variant::QUATERNION; + pinfo.type = Variant::VECTOR4; } break; case RS::GLOBAL_VAR_TYPE_RECT2: { pinfo.type = Variant::RECT2; @@ -169,15 +169,15 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const case RS::GLOBAL_VAR_TYPE_MAT3: { pinfo.type = Variant::BASIS; } break; + case RS::GLOBAL_VAR_TYPE_MAT4: { + pinfo.type = Variant::PROJECTION; + } break; case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: { pinfo.type = Variant::TRANSFORM2D; } break; case RS::GLOBAL_VAR_TYPE_TRANSFORM: { pinfo.type = Variant::TRANSFORM3D; } break; - case RS::GLOBAL_VAR_TYPE_MAT4: { - pinfo.type = Variant::PACKED_INT32_ARRAY; - } break; case RS::GLOBAL_VAR_TYPE_SAMPLER2D: { pinfo.type = Variant::OBJECT; pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE; |