diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-25 15:27:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 15:27:09 +0100 |
| commit | 2f237d181b6fd769b52bded49cafc9bc5eb9f087 (patch) | |
| tree | 7a675fe9331fd010c5e8486df42ac6fad188179c /servers/visual/shader_language.cpp | |
| parent | b8f0da7bed976f889a0316981dc419e179f63df8 (diff) | |
| parent | 33b5c571995cce60a21784ac33fcf958640ed1e2 (diff) | |
| download | redot-engine-2f237d181b6fd769b52bded49cafc9bc5eb9f087.tar.gz | |
Merge pull request #36515 from reduz/packed-array-64-bits
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT.
Diffstat (limited to 'servers/visual/shader_language.cpp')
| -rw-r--r-- | servers/visual/shader_language.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 438ec2079c..97a18e6d86 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2657,10 +2657,10 @@ PropertyInfo ShaderLanguage::uniform_to_property_info(const ShaderNode::Uniform case ShaderLanguage::TYPE_UVEC3: case ShaderLanguage::TYPE_UVEC4: { - pi.type = Variant::PACKED_INT_ARRAY; + pi.type = Variant::PACKED_INT32_ARRAY; } break; case ShaderLanguage::TYPE_FLOAT: { - pi.type = Variant::REAL; + pi.type = Variant::FLOAT; if (p_uniform.hint == ShaderLanguage::ShaderNode::Uniform::HINT_RANGE) { pi.hint = PROPERTY_HINT_RANGE; pi.hint_string = rtos(p_uniform.hint_range[0]) + "," + rtos(p_uniform.hint_range[1]) + "," + rtos(p_uniform.hint_range[2]); |