Upgraded Godot to 4.7 stable (contributed by williamchange)

Upgrade Godot to 4.7 stable

Author: RodZill4

.github/workflows/dev-desktop-builds.yml

@@ -24,9 +24,9 @@ on:
         default: "true"
 
 env:
-  GODOT_VERSION: 4.6.3
+  GODOT_VERSION: 4.7
   GODOT_SUB: stable
-  GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.6.3-stable
+  GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.7-stable
   EXPORT_NAME: material_maker
   MM_RELEASE: 1_6
 

addons/flexible_layout/flexible_overlay.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://gqucl1dthw6d"]
+[gd_scene format=3 uid="uid://gqucl1dthw6d"]
 
 [ext_resource type="Script" uid="uid://bhwlc7y7qgb2v" path="res://addons/flexible_layout/flexible_overlay.gd" id="1_5tomg"]
-[ext_resource type="Texture2D" uid="uid://c2ljin3axj2sd" path="res://addons/flexible_layout/arrow.svg" id="2_0tnc1"]
+[ext_resource type="Texture2D" uid="uid://7ydi1c1ic17e" path="res://addons/flexible_layout/arrow.svg" id="2_0tnc1"]
 
-[node name="Control" type="ColorRect"]
+[node name="Control" type="ColorRect" unique_id=619538545]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -12,15 +12,15 @@ grow_vertical = 2
 color = Color(0.501961, 0.501961, 0.501961, 0.501961)
 script = ExtResource("1_5tomg")
 
-[node name="Arrow" type="TextureRect" parent="."]
+[node name="Arrow" type="TextureRect" parent="." unique_id=607104480]
 visible = false
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 pivot_offset = Vector2(32, 32)
 texture = ExtResource("2_0tnc1")
 
-[node name="Rect" type="ColorRect" parent="."]
+[node name="Rect" type="ColorRect" parent="." unique_id=199752483]
 visible = false
 layout_mode = 0
 offset_right = 40.0

addons/material_maker/engine/shader_base.gd

@@ -11,5 +11,5 @@ func set_shader(shader : String) -> bool:
 func get_parameters() -> Dictionary:
 	return {}
 
-func set_parameter(name : String, value) -> bool:
-	return false
+func set_parameter(name : String, value) -> void:
+	pass

addons/material_maker/engine/shader_material.gd

@@ -27,7 +27,7 @@ func get_parameters() -> Dictionary:
 		rv[parameter_name] = material.get_shader_parameter(parameter_name)
 	return rv
 
-func set_parameter(name : String, value):
+func set_parameter(name : String, value) -> void:
 	if value is MMTexture:
 		material.set_shader_parameter(name, await value.get_texture())
 	else:

material_maker/panels/graph_edit/graph_edit.gd

@@ -82,6 +82,12 @@ 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()
 

material_maker/theme/classic_base.tres

@@ -95,6 +95,8 @@ 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
@@ -950,10 +952,6 @@ border_width_top = 1
 border_width_right = 1
 border_width_bottom = 1
 border_color = Color(0.145098, 0.145098, 0.164706, 1)
-corner_radius_top_left = 4
-corner_radius_top_right = 4
-corner_radius_bottom_right = 4
-corner_radius_bottom_left = 4
 corner_detail = 4
 shadow_color = Color(0, 0, 0, 0.059000004)
 shadow_size = 4
@@ -1058,6 +1056,12 @@ 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)

material_maker/theme/default.tres

@@ -105,6 +105,8 @@ 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
@@ -766,10 +768,6 @@ border_width_top = 1
 border_width_right = 1
 border_width_bottom = 1
 border_color = Color(0.207843, 0.215686, 0.235294, 1)
-corner_radius_top_left = 2
-corner_radius_top_right = 2
-corner_radius_bottom_right = 2
-corner_radius_bottom_left = 2
 corner_detail = 4
 shadow_color = Color(0, 0, 0, 0.0588235)
 shadow_size = 4
@@ -1160,10 +1158,6 @@ border_width_top = 1
 border_width_right = 1
 border_width_bottom = 1
 border_color = Color(0.145098, 0.145098, 0.164706, 1)
-corner_radius_top_left = 4
-corner_radius_top_right = 4
-corner_radius_bottom_right = 4
-corner_radius_bottom_left = 4
 corner_detail = 4
 shadow_color = Color(0, 0, 0, 0.0588235)
 shadow_size = 4
@@ -1279,6 +1273,12 @@ CodeEdit/styles/normal = SubResource("StyleBoxFlat_oy0ko")
 FileDialog/colors/file_disabled_color = Color(0.301961, 0.305882, 0.309804, 1)
 FileDialog/colors/file_icon_color = Color(0.698039, 0.698039, 0.698039, 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)

material_maker/widgets/option_edit/option_edit.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://dj5q8sxvd3gci"]
+[gd_scene format=3 uid="uid://dj5q8sxvd3gci"]
 
 [ext_resource type="Script" uid="uid://bnwwic4t5iaoc" path="res://material_maker/widgets/option_edit/option_edit.gd" id="1_no1tx"]
 
-[node name="OptionEdit" type="OptionButton"]
+[node name="OptionEdit" type="OptionButton" unique_id=212079376]
 offset_right = 32.0
 offset_bottom = 20.0
 theme_type_variation = &"MM_NodeOptionEdit"

project.godot

@@ -20,7 +20,7 @@ config/tags=PackedStringArray("material_maker")
 run/main_scene="res://parse_args.tscn"
 config/use_custom_user_dir=true
 config/custom_user_dir_name="material_maker_2"
-config/features=PackedStringArray("4.6")
+config/features=PackedStringArray("4.7")
 boot_splash/bg_color=Color(0, 0, 0, 1)
 boot_splash/show_image=false
 boot_splash/stretch_mode=0
@@ -60,7 +60,6 @@ window/size/borderless=true
 window/size/transparent=true
 window/size/window_width_override=1
 window/size/window_height_override=1
-window/per_pixel_transparency/allowed=true
 window/subwindows/embed_subwindows=false
 window/handheld/orientation.Android="sensor_landscape"