Merge branch 'export_plugin' into keys

addons/material_maker/engine/gen_switch.gd

@@ -13,9 +13,11 @@ func get_type_name():
 	return "Switch"
 
 func get_parameter_defs():
-	return [ { name="outputs", label="Outputs", type="float", min=1, max=5, step=1, default=2 },
+	return [
-			 { name="choices", label="Choices", type="float", min=2, max=5, step=1, default=2 },
+		{ name="outputs", label="Outputs", type="float", min=1, max=5, step=1, default=2 },
-			 { name="source", label="Source", type="float", min=0, max=1, step=1, default=0 } ]
+		{ name="choices", label="Choices", type="float", min=2, max=5, step=1, default=2 },
+		{ name="source", label="Source", type="float", min=0, max=1, step=1, default=0 },
+	]
 
 func get_input_defs():
 	var rv : Array = []

addons/material_maker/main_window.gd

@@ -47,6 +47,16 @@ var is_mac = false
 func _ready():
 	if OS.get_name() == "OSX":
 		is_mac = true
+
+  # Upscale everything if the display requires it (crude hiDPI support).
+	# This prevents UI elements from being too small on hiDPI displays.
+	if OS.get_screen_dpi() >= 192 and OS.get_screen_size().x >= 2048:
+		get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_DISABLED, SceneTree.STRETCH_ASPECT_IGNORE, Vector2(), 2)
+
+  # Set a minimum window size to prevent UI elements from collapsing on each other.
+	# This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist.
+	OS.set("min_window_size", Vector2(1024, 600))
+
 	if !Engine.editor_hint:
 		OS.set_window_title(ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release"))
 	load_recents()

addons/material_maker/main_window.tscn

@@ -26,11 +26,15 @@ script = ExtResource( 1 )
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_left = 6.0
+margin_top = 6.0
+margin_right = -6.0
+margin_bottom = -6.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="Menu" type="HBoxContainer" parent="VBoxContainer"]
-margin_right = 1280.0
+margin_right = 1268.0
 margin_bottom = 20.0
 
 [node name="File" type="MenuButton" parent="VBoxContainer/Menu"]
@@ -69,19 +73,19 @@ items = [ "User manual", null, 0, false, false, 21, 0, null, "", false, "Report
 
 [node name="HBoxContainer" type="HSplitContainer" parent="VBoxContainer"]
 margin_top = 24.0
-margin_right = 1280.0
+margin_right = 1268.0
-margin_bottom = 720.0
+margin_bottom = 708.0
 size_flags_vertical = 3
 
 [node name="VBoxContainer" type="VSplitContainer" parent="VBoxContainer/HBoxContainer"]
-margin_right = 314.0
+margin_right = 311.0
-margin_bottom = 696.0
+margin_bottom = 684.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="Library" parent="VBoxContainer/HBoxContainer/VBoxContainer" instance=ExtResource( 2 )]
-margin_right = 314.0
+margin_right = 311.0
-margin_bottom = 411.0
+margin_bottom = 404.0
 size_flags_vertical = 3
 size_flags_stretch_ratio = 1.5
 
@@ -89,14 +93,14 @@ size_flags_stretch_ratio = 1.5
 anchor_left = 0.0
 anchor_right = 0.0
 margin_left = 0.0
-margin_top = 423.0
+margin_top = 416.0
-margin_right = 314.0
+margin_right = 311.0
-margin_bottom = 696.0
+margin_bottom = 684.0
 
 [node name="ProjectsPane" type="Control" parent="VBoxContainer/HBoxContainer"]
-margin_left = 326.0
+margin_left = 323.0
-margin_right = 1280.0
+margin_right = 1268.0
-margin_bottom = 696.0
+margin_bottom = 684.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 size_flags_stretch_ratio = 3.0
@@ -108,8 +112,9 @@ anchor_bottom = 1.0
 stretch = true
 
 [node name="Viewport" type="Viewport" parent="VBoxContainer/HBoxContainer/ProjectsPane/BackgroundPreview"]
-size = Vector2( 954, 696 )
+size = Vector2( 945, 684 )
 handle_input_locally = false
+msaa = 2
 render_target_update_mode = 0
 
 [node name="Camera" type="Camera" parent="VBoxContainer/HBoxContainer/ProjectsPane/BackgroundPreview/Viewport"]
@@ -121,12 +126,14 @@ current = true
 self_modulate = Color( 1, 1, 1, 0 )
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_right = 5.0
+margin_bottom = 5.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource( 5 )
 
 [node name="Tabs" type="Tabs" parent="VBoxContainer/HBoxContainer/ProjectsPane/Projects"]
-margin_right = 954.0
+margin_right = 950.0
 margin_bottom = 24.0
 tab_align = 0
 tab_close_display_policy = 1

addons/material_maker/preview.tscn

@@ -36,6 +36,7 @@ size = Vector2( 395, 370 )
 own_world = true
 world = SubResource( 1 )
 handle_input_locally = false
+msaa = 2
 render_target_clear_mode = 1
 render_target_update_mode = 3
 physics_object_picking = true

project.godot

@@ -167,6 +167,7 @@ gdscript/warnings/unsafe_call_argument=true
 
 window/size/width=1280
 window/size/height=720
+window/dpi/allow_hidpi=true
 
 [logging]