diff options
| author | reduz <reduzio@gmail.com> | 2021-07-05 22:40:29 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2021-07-07 10:57:56 -0300 |
| commit | d41e3f9aebf294ccb6238795b8cfb3c815ea3a93 (patch) | |
| tree | 01fd4469b3de3f20e2d96c224c764ec0d2931d32 /scene/resources/material.h | |
| parent | 8cd1b59ea78f5145eae1762e2b1311c1a1b92cbc (diff) | |
| download | redot-engine-d41e3f9aebf294ccb6238795b8cfb3c815ea3a93.tar.gz | |
Fix Command Queue Crash
* No longer allow sending an object (texture) to the server as material parameter
* Keep a parameter cache locally in ShaderMaterial
Diffstat (limited to 'scene/resources/material.h')
| -rw-r--r-- | scene/resources/material.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/material.h b/scene/resources/material.h index cd91d05a60..e6d6503067 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -79,6 +79,8 @@ class ShaderMaterial : public Material { GDCLASS(ShaderMaterial, Material); Ref<Shader> shader; + Map<StringName, Variant> param_cache; + protected: bool _set(const StringName &p_name, const Variant &p_value); bool _get(const StringName &p_name, Variant &r_ret) const; |