Skip to content

Fix linked controls using widget defaults #1375

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
williamchange wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −6
Open

Fix linked controls using widget defaults #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f05fa
Fixed linked controls using widget defaults
williamchange Apr 5, 2026
30cd212
Fixed non-existent signal errors when editing enum
williamchange Apr 5, 2026
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
5 changes: 2 additions & 3 deletions addons/material_maker/engine/nodes/gen_remote.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,10 @@ func link_parameter(widget_name : String, generator : MMGenBase, param : String)
match widget.type:
"linked_control":
parameters[widget_name] = generator.parameters[param]
# use linked floatedit value(instead of default) when linked
# use linked value (instead of widget defaults)
var param_def : Dictionary = generator.get_parameter_def(param)
if name == "gen_parameters" and param_def.has("type"):
if param_def.type == "float":
set_parameter(widget_name, parameters[widget_name])
set_parameter(widget_name, parameters[widget_name])
"config_control":
parameters[widget_name] = 0
emit_signal("parameter_changed", "__update_all__", null)
Expand Down
7 changes: 4 additions & 3 deletions material_maker/windows/node_editor/parameter_enum.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,24 @@ func _on_EnumValues_item_selected(id) -> void:
if id >= 0 and id < enum_values.size():
enum_current = id
elif id == ENUM_EDIT:
var dialog = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
var dialog : Window = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
dialog.content_scale_factor = content_scale_factor
dialog.min_size = Vector2(250, 90) * content_scale_factor
var v = enum_values[enum_current]
add_child(dialog)
dialog.set_value(v.name, v.value)
dialog.connect("ok", Callable(self, "update_enum_value").bind(enum_current))
dialog.close_requested.connect(dialog.queue_free)
dialog.connect("popup_hide", Callable(dialog, "queue_free"))
dialog.hide()
dialog.popup_centered()
elif id == ENUM_ADD:
var dialog = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
var dialog : Window = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
dialog.content_scale_factor = content_scale_factor
dialog.min_size = Vector2(250, 90) * content_scale_factor
add_child(dialog)
dialog.connect("ok", Callable(self, "update_enum_value").bind(-1))
dialog.connect("popup_hide", Callable(dialog, "queue_free"))
dialog.close_requested.connect(dialog.queue_free)
dialog.hide()
dialog.popup_centered()
elif id == ENUM_REMOVE:
Expand Down