diff options
author | Thaddeus Crews <repiteo@outlook.com> | 2024-10-10 18:13:16 -0500 |
---|---|---|
committer | Thaddeus Crews <repiteo@outlook.com> | 2024-10-10 18:13:16 -0500 |
commit | 9d5a7321a54f2a27ff8b273083c8f30e23bfd0ec (patch) | |
tree | 6d941556921414bc16fcea4564c01948341f7b0f /scene/resources/material.cpp | |
parent | 44b797fbe63aa8a9803836b9e4c6a175c24cb755 (diff) | |
parent | b9d25580ce2a8d00bf372c5304f6d7c65141fac9 (diff) | |
download | redot-engine-9d5a7321a54f2a27ff8b273083c8f30e23bfd0ec.tar.gz |
Merge pull request #95175 from KoBeWi/bruh_can_revert
Fix implementation of `property_can_revert()` in various classes
Diffstat (limited to 'scene/resources/material.cpp')
-rw-r--r-- | scene/resources/material.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 9df009ec28..ecc1982aa5 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -382,14 +382,11 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const { bool ShaderMaterial::_property_can_revert(const StringName &p_name) const { if (shader.is_valid()) { - const StringName *pr = remap_cache.getptr(p_name); - if (pr) { - Variant default_value = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), *pr); - Variant current_value = get_shader_parameter(*pr); - return default_value.get_type() != Variant::NIL && default_value != current_value; - } else if (p_name == "render_priority" || p_name == "next_pass") { + if (remap_cache.has(p_name)) { return true; } + const String sname = p_name; + return sname == "render_priority" || sname == "next_pass"; } return false; } |