godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Check is the ref shader valid in visual shader's update_option_menu

Browse Source 
(cherry picked from commit ff089f8cea)
This commit is contained in:
jsjtxietian
2024-01-19 12:32:44 +08:00
committed by Rémi Verschelde
parent fddd0a5098
commit 7c162351c9
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/visual_shader_editor_plugin.cpp
View File

@@ -1792,7 +1792,7 @@ void VisualShaderEditor::_update_options_menu() {
} }
Ref<VisualShaderNodeParameterRef> parameter_ref = Object::cast_to<VisualShaderNodeParameterRef>(vsn.ptr()); Ref<VisualShaderNodeParameterRef> parameter_ref = Object::cast_to<VisualShaderNodeParameterRef>(vsn.ptr());
if (parameter_ref.is_valid()) { if (parameter_ref.is_valid() && parameter_ref->is_shader_valid()) {
check_result = -1; check_result = -1;
if (members_input_port_type != VisualShaderNode::PORT_TYPE_MAX) { if (members_input_port_type != VisualShaderNode::PORT_TYPE_MAX) {

4
scene/resources/visual_shader.cpp
View File

@@ -3576,6 +3576,10 @@ String VisualShaderNodeParameterRef::get_output_port_name(int p_port) const {
return ""; return "";
} }
bool VisualShaderNodeParameterRef::is_shader_valid() const {
return shader_rid.is_valid();
}
void VisualShaderNodeParameterRef::set_shader_rid(const RID &p_shader_rid) { void VisualShaderNodeParameterRef::set_shader_rid(const RID &p_shader_rid) {
shader_rid = p_shader_rid; shader_rid = p_shader_rid;
} }

1
scene/resources/visual_shader.h
View File

@@ -639,6 +639,7 @@ public:
virtual PortType get_output_port_type(int p_port) const override; virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override; virtual String get_output_port_name(int p_port) const override;
bool is_shader_valid() const;
void set_shader_rid(const RID &p_shader); void set_shader_rid(const RID &p_shader);
void set_parameter_name(const String &p_name); void set_parameter_name(const String &p_name);