diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-18 12:05:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 12:05:02 +0100 |
| commit | 60ee61c7ff05330db383dd937da20d49f8ac4ac6 (patch) | |
| tree | ff2793e5dc18f3a5659ff3256f62388c29be6ad3 /servers/visual/shader_language.cpp | |
| parent | ede4decd4eceb8d63aa82bcd8b3da336e706333f (diff) | |
| parent | fb92c7b0fa7faf0f69b5da0bef3fcc2350fd832e (diff) | |
| download | redot-engine-60ee61c7ff05330db383dd937da20d49f8ac4ac6.tar.gz | |
Merge pull request #23742 from JFonS/fix_23698
Use hint_color when getting shader default params
Diffstat (limited to 'servers/visual/shader_language.cpp')
| -rw-r--r-- | servers/visual/shader_language.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 0783d91a59..358ed8ca54 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2353,7 +2353,7 @@ bool ShaderLanguage::is_sampler_type(DataType p_type) { p_type == TYPE_SAMPLERCUBE; } -Variant ShaderLanguage::constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type) { +Variant ShaderLanguage::constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type, ShaderLanguage::ShaderNode::Uniform::Hint p_hint) { if (p_value.size() > 0) { Variant value; switch (p_type) { @@ -2397,7 +2397,11 @@ Variant ShaderLanguage::constant_value_to_variant(const Vector<ShaderLanguage::C value = Variant(Vector3(p_value[0].real, p_value[1].real, p_value[2].real)); break; case ShaderLanguage::TYPE_VEC4: - value = Variant(Plane(p_value[0].real, p_value[1].real, p_value[2].real, p_value[3].real)); + if (p_hint == ShaderLanguage::ShaderNode::Uniform::HINT_COLOR) { + value = Variant(Color(p_value[0].real, p_value[1].real, p_value[2].real, p_value[3].real)); + } else { + value = Variant(Plane(p_value[0].real, p_value[1].real, p_value[2].real, p_value[3].real)); + } break; case ShaderLanguage::TYPE_MAT2: value = Variant(Transform2D(p_value[0].real, p_value[2].real, p_value[1].real, p_value[3].real, 0.0, 0.0)); |