Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion addons/gut/gui/EditorRadioButton.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dssgvu257o1si"]
[gd_resource type="Theme" format=3 uid="uid://dssgvu257o1si"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_u716c"]
bg_color = Color(0.43137255, 0.8784314, 0.6156863, 0.5254902)
Expand Down
6 changes: 4 additions & 2 deletions material_maker/doc/user_interface_shortcuts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,16 @@ Graph Editor
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Ctrl-RMB` | Connection knife tool |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Ctrl/Cmd-Shift-RMB` | Insert aperture pair on connection line |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Shift-RMB` | Insert reroute on connection line |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`X` | :kbd:`Del` | :kbd:`Backspace` | Delete selected nodes |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Ctrl/Cmd-D` | Duplicate selected nodes |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Ctrl/Cmd-Shift-D` | Duplicate selected nodes with inuputs |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Shift-RMB` | Insert reroute on connection line |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`F2` | :kbd:`Enter` | :kbd:`LMB` Double-click | Edit selected aperture node |
+-------------------------------------------------------+----------------------------------------------------+
| :kbd:`Ctrl/Cmd-G` | Create group from selected nodes |
Expand Down
6 changes: 3 additions & 3 deletions material_maker/panels/graph_edit/graph_edit.gd
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,10 @@ func _gui_input(event) -> void:
do_zoom(1.0/1.1)
elif event.button_index == MOUSE_BUTTON_RIGHT and event.is_pressed():
valid_drag_cut_entry = true
if event.shift_pressed:
add_reroute_under_mouse()
elif event.ctrl_pressed:
if event.is_command_or_control_pressed() and event.shift_pressed:
create_portals()
elif event.shift_pressed:
add_reroute_under_mouse()

for c in get_children():
if ! c is GraphNode:
Expand Down