From d41e3f9aebf294ccb6238795b8cfb3c815ea3a93 Mon Sep 17 00:00:00 2001
From: reduz <reduzio@gmail.com>
Date: Mon, 5 Jul 2021 22:40:29 -0300
Subject: Fix Command Queue Crash

* No longer allow sending an object (texture) to the server as material parameter
* Keep a parameter cache locally in ShaderMaterial
---
 scene/resources/material.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scene/resources/material.h')

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;
-- 
cgit v1.2.3