diff options
| author | bitsawer <sawerduster@gmail.com> | 2023-03-15 08:40:06 +0200 |
|---|---|---|
| committer | bitsawer <sawerduster@gmail.com> | 2023-05-29 15:17:13 +0300 |
| commit | 23c375d6b4f6e10690906e07a7e50ec53260d440 (patch) | |
| tree | ebe1032a622a6a5a908319abe8b316fbf45c827e /scene/main/shader_globals_override.cpp | |
| parent | 2f57da290796fbba7c141240bef22baf21615888 (diff) | |
| download | redot-engine-23c375d6b4f6e10690906e07a7e50ec53260d440.tar.gz | |
Fix shader uniform storage conversions and crash
Diffstat (limited to 'scene/main/shader_globals_override.cpp')
| -rw-r--r-- | scene/main/shader_globals_override.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index 51fc948886..7fff74e8e1 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -128,7 +128,7 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const pinfo.type = Variant::VECTOR3I; } break; case RS::GLOBAL_VAR_TYPE_IVEC4: { - pinfo.type = Variant::PACKED_INT32_ARRAY; + pinfo.type = Variant::VECTOR4I; } break; case RS::GLOBAL_VAR_TYPE_RECT2I: { pinfo.type = Variant::RECT2I; @@ -143,7 +143,7 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const pinfo.type = Variant::VECTOR3I; } break; case RS::GLOBAL_VAR_TYPE_UVEC4: { - pinfo.type = Variant::PACKED_INT32_ARRAY; + pinfo.type = Variant::VECTOR4I; } break; case RS::GLOBAL_VAR_TYPE_FLOAT: { pinfo.type = Variant::FLOAT; @@ -164,7 +164,7 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const pinfo.type = Variant::COLOR; } break; case RS::GLOBAL_VAR_TYPE_MAT2: { - pinfo.type = Variant::PACKED_INT32_ARRAY; + pinfo.type = Variant::PACKED_FLOAT32_ARRAY; } break; case RS::GLOBAL_VAR_TYPE_MAT3: { pinfo.type = Variant::BASIS; |