Merge branch 'master' of https://github.com/RodZill4/material-maker

Author: RodZill4

material_maker/panels/graph_edit/graph_edit.gd

@@ -1327,7 +1327,7 @@ func add_reroute_to_input(node : MMGraphNodeMinimal, port_index : int) -> void:
 	if ! removed:
 		var global_scale = Vector2(1, 1) # node.get_global_transform().get_scale()
 		var port_position = node.position_offset+node.get_input_port_position(port_index)/global_scale
-		var reroute_position = port_position+Vector2(-74, -12)
+		var reroute_position = port_position+Vector2(-74, -31)
 		var reroute_node = {name="reroute",type="reroute",node_position={x=reroute_position.x,y=reroute_position.y}}
 		for c2 in get_connection_list():
 			if c2.to_node == node.name and c2.to_port == port_index:
@@ -1360,7 +1360,7 @@ func add_reroute_to_output(node : MMGraphNodeMinimal, port_index : int) -> void:
 	if !reroutes:
 		var global_scale = Vector2(1, 1) # node.get_global_transform().get_scale()
 		var port_position = node.position_offset+node.get_output_port_position(port_index)/global_scale
-		var reroute_position = port_position+Vector2(50, -12)
+		var reroute_position = port_position+Vector2(50, -31)
 		var reroute_node = {name="reroute",type="reroute",node_position={x=reroute_position.x,y=reroute_position.y}}
 		var reroute_connections = [ { from=node.generator.name, from_port=port_index, to="reroute", to_port=0 }]
 		for d in destinations:

material_maker/panels/preview_3d/export_menu.gd

@@ -93,3 +93,7 @@ func interpret_map_file_name(file_name: String, path:="") -> String:
 		1: extension += ".exr"
 
 	return mm_globals.interpret_file_name(file_name, path, extension, additional_ids)
+
+
+func _on_map_file_type_item_selected(_index: int) -> void:
+	update_generate_map_file_label()

material_maker/panels/preview_3d/preview_3d.tscn

@@ -455,4 +455,5 @@ text = "Generate Map"
 [connection signal="item_selected" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/MapType" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_type_item_selected"]
 [connection signal="item_selected" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/MapResolution" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_resolution_item_selected"]
 [connection signal="text_changed" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/ExportFile/BoxContainer/MapExportFile" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_export_file_text_changed"]
+[connection signal="item_selected" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/ExportFile/BoxContainer/MapFileType" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_file_type_item_selected"]
 [connection signal="pressed" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapButton" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_generate_map_button_pressed"]