diff --git a/.github/workflows/dev-desktop-builds.yml b/.github/workflows/dev-desktop-builds.yml index d9cb3a2a3..03a49eaa8 100644 --- a/.github/workflows/dev-desktop-builds.yml +++ b/.github/workflows/dev-desktop-builds.yml @@ -34,9 +34,9 @@ on: default: "false" env: - GODOT_VERSION: 4.7 + GODOT_VERSION: 4.7.1 GODOT_SUB: stable - GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.7-stable + GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.7.1-stable EXPORT_NAME: material_maker MM_RELEASE: 1_7 EXPORT_TARGET_SUFFIX: "${{ github.event.inputs.steam == 'true' && ' Steam' || '' }}" diff --git a/material_maker/panels/graph_edit/graph_edit.gd b/material_maker/panels/graph_edit/graph_edit.gd index d9bb53344..dad78a3cd 100644 --- a/material_maker/panels/graph_edit/graph_edit.gd +++ b/material_maker/panels/graph_edit/graph_edit.gd @@ -82,12 +82,6 @@ func _ready() -> void: add_valid_connection_type(42, t) node_popup.about_to_popup.connect(func(): valid_drag_cut_entry = false) - # workaround for godot issue 120454 - for node in get_children(true): - if "GraphEditFilter" in node.name: - node.get_child(0).use_parent_material = false - break - func _exit_tree(): remove_crash_recovery_file() diff --git a/material_maker/theme/classic_base.tres b/material_maker/theme/classic_base.tres index 846f33cf3..0a0f29cac 100644 --- a/material_maker/theme/classic_base.tres +++ b/material_maker/theme/classic_base.tres @@ -95,8 +95,6 @@ region = Rect2(96, 112, 16, 16) [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_meah8"] bg_color = Color(0.14902, 0.172549, 0.231373, 1) -[sub_resource type="DPITexture" id="DPITexture_thibc"] - [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7b2nb"] content_margin_left = 4.0 content_margin_top = 4.0 @@ -1101,12 +1099,6 @@ CodeEdit/colors/single_line_comment_color = Color(0, 0.509804, 0, 1) CodeEdit/colors/symbol_color = Color(1, 1, 1, 1) CodeEdit/colors/type_color = Color(1, 1, 0.878431, 1) CodeEdit/styles/normal = SubResource("StyleBoxFlat_meah8") -FileDialog/icons/menu_copy_path = SubResource("DPITexture_thibc") -FileDialog/icons/menu_delete = SubResource("DPITexture_thibc") -FileDialog/icons/menu_new_folder = SubResource("DPITexture_thibc") -FileDialog/icons/menu_open_bundle = SubResource("DPITexture_thibc") -FileDialog/icons/menu_refresh = SubResource("DPITexture_thibc") -FileDialog/icons/menu_show_in_file_manager = SubResource("DPITexture_thibc") FileDialog/styles/panel = SubResource("StyleBoxFlat_7b2nb") GraphEdit/colors/connection_knife = Color(1, 1, 1, 1) GraphEdit/colors/grid_major = Color(0.321569, 0.337255, 0.384314, 1) diff --git a/material_maker/theme/default.tres b/material_maker/theme/default.tres index dd8b6e67b..53fe623bc 100644 --- a/material_maker/theme/default.tres +++ b/material_maker/theme/default.tres @@ -105,8 +105,6 @@ metadata/recolor = false [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_oy0ko"] bg_color = Color(0.0980392, 0.0980392, 0.101961, 1) -[sub_resource type="DPITexture" id="DPITexture_u716c"] - [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ck0hb"] content_margin_left = 4.0 content_margin_top = 4.0 @@ -1313,12 +1311,6 @@ CodeEdit/styles/focus = SubResource("StyleBoxEmpty_m27ao") CodeEdit/styles/normal = SubResource("StyleBoxFlat_oy0ko") FileDialog/colors/file_disabled_color = Color(0.301961, 0.305882, 0.309804, 1) FileDialog/colors/folder_icon_color = Color(0.698039, 0.698039, 0.698039, 1) -FileDialog/icons/menu_copy_path = SubResource("DPITexture_u716c") -FileDialog/icons/menu_delete = SubResource("DPITexture_u716c") -FileDialog/icons/menu_new_folder = SubResource("DPITexture_u716c") -FileDialog/icons/menu_open_bundle = SubResource("DPITexture_u716c") -FileDialog/icons/menu_refresh = SubResource("DPITexture_u716c") -FileDialog/icons/menu_show_in_file_manager = SubResource("DPITexture_u716c") FileDialog/styles/panel = SubResource("StyleBoxFlat_ck0hb") GraphEdit/colors/connection_knife = Color(0.99215686, 0.9843137, 1, 1) GraphEdit/colors/grid_major = Color(0.137255, 0.141176, 0.152941, 1)