1 files changed, 20 insertions, 17 deletions

diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h
index 9396a53e8b..ef724c7650 100644
--- a/scene/resources/visual_shader.h
+++ b/scene/resources/visual_shader.h
@@ -32,6 +32,7 @@
 #define VISUAL_SHADER_H
 
 #include "core/string/string_builder.h"
+#include "core/templates/safe_refcount.h"
 #include "scene/gui/control.h"
 #include "scene/resources/shader.h"
 
@@ -57,10 +58,10 @@ public:
 	};
 
 	struct Connection {
-		int from_node;
-		int from_port;
-		int to_node;
-		int to_port;
+		int from_node = 0;
+		int from_port = 0;
+		int to_node = 0;
+		int to_port = 0;
 	};
 
 	struct DefaultTextureParam {
@@ -90,7 +91,7 @@ private:
 	Vector2 graph_offset;
 
 	struct RenderModeEnums {
-		Shader::Mode mode;
+		Shader::Mode mode = Shader::Mode::MODE_MAX;
 		const char *string;
 	};
 
@@ -99,7 +100,7 @@ private:
 
 	static RenderModeEnums render_mode_enums[];
 
-	volatile mutable bool dirty = true;
+	mutable SafeFlag dirty;
 	void _queue_update();
 
 	union ConnectionKey {
@@ -107,7 +108,7 @@ private:
 			uint64_t node : 32;
 			uint64_t port : 32;
 		};
-		uint64_t key;
+		uint64_t key = 0;
 		bool operator<(const ConnectionKey &p_key) const {
 			return key < p_key.key;
 		}
@@ -126,6 +127,8 @@ protected:
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
+	virtual void reset_state() override;
+
 public: // internal methods
 	void set_shader_type(Type p_type);
 	Type get_shader_type() const;
@@ -265,7 +268,7 @@ class VisualShaderNodeCustom : public VisualShaderNode {
 
 	struct Port {
 		String name;
-		int type;
+		int type = 0;
 	};
 
 	List<Port> input_ports;
@@ -305,9 +308,9 @@ class VisualShaderNodeInput : public VisualShaderNode {
 	Shader::Mode shader_mode = Shader::MODE_MAX;
 
 	struct Port {
-		Shader::Mode mode;
-		VisualShader::Type shader_type;
-		PortType type;
+		Shader::Mode mode = Shader::Mode::MODE_MAX;
+		VisualShader::Type shader_type = VisualShader::Type::TYPE_MAX;
+		PortType type = PortType::PORT_TYPE_MAX;
 		const char *name;
 		const char *string;
 	};
@@ -356,13 +359,13 @@ class VisualShaderNodeOutput : public VisualShaderNode {
 
 public:
 	friend class VisualShader;
-	VisualShader::Type shader_type;
-	Shader::Mode shader_mode;
+	VisualShader::Type shader_type = VisualShader::Type::TYPE_MAX;
+	Shader::Mode shader_mode = Shader::Mode::MODE_MAX;
 
 	struct Port {
-		Shader::Mode mode;
-		VisualShader::Type shader_type;
-		PortType type;
+		Shader::Mode mode = Shader::Mode::MODE_MAX;
+		VisualShader::Type shader_type = VisualShader::Type::TYPE_MAX;
+		PortType type = PortType::PORT_TYPE_MAX;
 		const char *name;
 		const char *string;
 	};
@@ -519,7 +522,7 @@ protected:
 	bool editable = false;
 
 	struct Port {
-		PortType type;
+		PortType type = PortType::PORT_TYPE_MAX;
 		String name;
 	};