Skip to content

Fix crash when modify parameter of visual shader #112111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

Fix crash when modify parameter of visual shader #112111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions editor/shader/visual_shader_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2112,6 +2112,9 @@ void VisualShaderEditor::_update_preview_parameter_list() {
List<PropertyInfo> properties;
RenderingServer::get_singleton()->get_shader_parameter_list(visual_shader->get_rid(), &properties);

// check whether properties changed
bool is_dirty = false;

HashSet<String> params_to_remove;
for (const KeyValue<String, PropertyInfo> &E : parameter_props) {
params_to_remove.insert(E.key);
Expand All @@ -2127,6 +2130,11 @@ void VisualShaderEditor::_update_preview_parameter_list() {
preview_material->set_shader_parameter(param_name, RenderingServer::get_singleton()->shader_get_parameter_default(visual_shader->get_rid(), param_name));
}

if (!params_to_remove.has(param_name)) {
// new parameter, mark dirty
is_dirty = true;
}

parameter_props.insert(param_name, prop);
params_to_remove.erase(param_name);

Expand All @@ -2137,6 +2145,11 @@ void VisualShaderEditor::_update_preview_parameter_list() {
}
}

if (!is_dirty && params_to_remove.is_empty()) {
// skip fresh preview parameter list
return;
}

_update_preview_parameter_tree();

// Removes invalid parameters.
Expand Down Expand Up @@ -5206,6 +5219,9 @@ void VisualShaderEditor::_param_selected() {
_clear_preview_param();

TreeItem *item = parameters->get_selected();

ERR_FAIL_NULL_MSG(item, "Cannot find selected TreeItem.");

selected_param_id = item->get_meta("id");

PropertyInfo pi = parameter_props.get(selected_param_id);
Expand Down
Loading