diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-03 23:07:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 23:07:21 +0200 |
| commit | 5d9cab3aeb3c62df6b7b44e6e68c0ebbb67f7a45 (patch) | |
| tree | 619055aeb386211fb83a7c861ab0f79a34aedb2d /servers/rendering/shader_language.cpp | |
| parent | ea2a0b54554c09999d74212925322e8c7b2437e0 (diff) | |
| parent | 0ac4051c00898b316ae11e7075d3f3a9e3c46be3 (diff) | |
Merge pull request #38430 from aaronfranke/transform3d
Diffstat (limited to 'servers/rendering/shader_language.cpp')
| -rw-r--r-- | servers/rendering/shader_language.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 14b21e1f42..f485d79fb0 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -2941,7 +2941,7 @@ Variant ShaderLanguage::constant_value_to_variant(const Vector<ShaderLanguage::C p[2][0] = p_value[8].real; p[2][1] = p_value[9].real; p[2][2] = p_value[10].real; - Transform t = Transform(p, Vector3(p_value[3].real, p_value[7].real, p_value[11].real)); + Transform3D t = Transform3D(p, Vector3(p_value[3].real, p_value[7].real, p_value[11].real)); value = Variant(t); break; } @@ -3040,7 +3040,7 @@ PropertyInfo ShaderLanguage::uniform_to_property_info(const ShaderNode::Uniform pi.type = Variant::BASIS; break; case ShaderLanguage::TYPE_MAT4: - pi.type = Variant::TRANSFORM; + pi.type = Variant::TRANSFORM3D; break; case ShaderLanguage::TYPE_SAMPLER2D: case ShaderLanguage::TYPE_ISAMPLER2D: |