diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-29 13:17:25 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-29 13:17:25 +0100 |
| commit | 563364d93e2381d44332352a16af1a9e989d0734 (patch) | |
| tree | 3ce5ff10517f905aa47607eeb33ea3b915ad0b8f /scene/resources/material.cpp | |
| parent | 78680cdebc8a97bc2d81decc72cd8cccafe1f669 (diff) | |
| parent | f04b584ed36016a1fcf6f26400f84ee4159560e2 (diff) | |
| download | redot-engine-563364d93e2381d44332352a16af1a9e989d0734.tar.gz | |
Merge pull request #87603 from jsjtxietian/_property_get_revert
Fix `ShaderMaterial::_property_get_revert` crash when given non-existing `p_name`
Diffstat (limited to 'scene/resources/material.cpp')
| -rw-r--r-- | scene/resources/material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 74b1157e5f..b0d77751af 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -372,7 +372,7 @@ bool ShaderMaterial::_property_can_revert(const StringName &p_name) const { bool ShaderMaterial::_property_get_revert(const StringName &p_name, Variant &r_property) const { if (shader.is_valid()) { const StringName *pr = remap_cache.getptr(p_name); - if (*pr) { + if (pr) { r_property = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), *pr); return true; } |