Merge branch 'master' into dev-generic

material_maker/library_tree.gd

@@ -1,4 +1,3 @@
-tool
 extends Tree
 
 func get_drag_data(position):

material_maker/node_factory.gd

@@ -1,4 +1,3 @@
-tool
 extends Node
 
 var includes

material_maker/nodes/edit_buttons.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 func connect_buttons(object, edit_fct, load_fct, save_fct) -> void:

material_maker/nodes/image.gd

@@ -1,4 +1,3 @@
-tool
 extends MMGraphNodeBase
 
 func _ready() -> void:

material_maker/nodes/remote.gd

@@ -1,4 +1,3 @@
-tool
 extends MMGraphNodeGeneric
 class_name MMGraphNodeRemote
 

material_maker/nodes/switch.gd

@@ -1,4 +1,3 @@
-tool
 extends MMGraphNodeGeneric
 
 var fixed_lines : int = 0

material_maker/preview/preview_light.gd

@@ -1,4 +1,3 @@
-tool
 extends Area
 
 func _on_Light_input_event(camera, event, click_position, click_normal, shape_idx) -> void:

material_maker/widgets/about/about.gd

@@ -1,4 +1,3 @@
-tool
 extends WindowDialog
 
 

material_maker/widgets/float_edit.gd

@@ -1,4 +1,3 @@
-tool
 extends LineEdit
 class_name MMFloatEdit
 

material_maker/widgets/gradient_editor.gd

@@ -1,4 +1,3 @@
-tool
 extends Control
 class_name MMGradientEditor
 

material_maker/widgets/gradient_editor.tscn

@@ -3,7 +3,6 @@
 [ext_resource path="res://material_maker/widgets/gradient_editor.gd" type="Script" id=1]
 [ext_resource path="res://material_maker/icons/icons.svg" type="Texture" id=2]
 
-
 [sub_resource type="Shader" id=1]
 code = "shader_type canvas_item;
 

material_maker/widgets/gradient_popup.gd

@@ -5,11 +5,8 @@ signal updated(value)
 func init(value) -> void:
 	$Panel/Control.set_value(value)
 
-
-
 func _on_Control_updated(value) -> void:
 	emit_signal("updated", value)
 
-
 func _on_GradientPopup_popup_hide() -> void:
 	queue_free()

material_maker/widgets/gradient_popup.tscn

@@ -3,12 +3,10 @@
 [ext_resource path="res://material_maker/widgets/gradient_popup.gd" type="Script" id=1]
 [ext_resource path="res://material_maker/widgets/gradient_editor.tscn" type="PackedScene" id=2]
 
-
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0, 0, 0.25098, 0.752941 )
 
 [node name="GradientPopup" type="Popup"]
-visible = true
 margin_right = 632.0
 margin_bottom = 49.0
 size_flags_horizontal = 0

material_maker/widgets/graph_tree/graph_tree.gd

@@ -1,4 +1,3 @@
-tool
 extends Popup
 
 signal item_double_clicked(generator)

material_maker/widgets/hslider.gd

@@ -1,4 +1,3 @@
-tool
 extends HSlider
 
 func _ready() -> void:

material_maker/widgets/line_dialog.gd

@@ -1,4 +1,3 @@
-tool
 extends WindowDialog
 
 signal ok

material_maker/widgets/linked_widgets/editable_label.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 var text setget set_text, get_text

material_maker/widgets/linked_widgets/link.gd

@@ -1,4 +1,3 @@
-tool
 extends Control
 class_name MMNodeLink
 

material_maker/widgets/node_editor/enum_editor.gd

@@ -1,4 +1,3 @@
-tool
 extends WindowDialog
 
 signal ok

material_maker/widgets/node_editor/input.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 func _ready():

material_maker/widgets/node_editor/node_editor.gd

@@ -1,4 +1,3 @@
-tool
 extends WindowDialog
 
 var model_data = null

material_maker/widgets/node_editor/node_editor_item_list.gd

@@ -1,4 +1,3 @@
-tool
 extends VBoxContainer
 
 func update_up_down_buttons() -> void:

material_maker/widgets/node_editor/output.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 func _ready():

material_maker/widgets/node_editor/parameter.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 func _ready() -> void:

material_maker/widgets/node_editor/parameter_boolean.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 func get_model_data() -> Dictionary:

material_maker/widgets/node_editor/parameter_color.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 func get_model_data() -> Dictionary:

material_maker/widgets/node_editor/parameter_enum.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 var enum_values = [ {name="Foo", value="foo"} ]

material_maker/widgets/node_editor/parameter_float.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 const CONTROLS = [ "None", "P1.x", "P1.y", "P1.a", "P1.r", "P2.x", "P2.y", "P2.a", "P2.r", "Rect1.x", "Rect1.y", "Radius1.r", "Radius1.a", "Radius11.r", "Radius11.a", "Scale1.x", "Scale1.y", "Angle1.a", "Angle2.a" ]

material_maker/widgets/node_editor/parameter_gradient.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 onready var default = $Default

material_maker/widgets/node_editor/parameter_size.gd

@@ -1,4 +1,3 @@
-tool
 extends HBoxContainer
 
 var size_first : int = 0

material_maker/widgets/text_dialog.gd

@@ -1,4 +1,3 @@
-tool
 extends WindowDialog
 
 signal ok

material_maker/widgets/text_dialog.tscn

@@ -2,145 +2,42 @@
 
 [ext_resource path="res://material_maker/widgets/text_dialog.gd" type="Script" id=1]
 
-
+[node name="TextDialog" type="WindowDialog"]
-[node name="TextDialog" type="WindowDialog" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_right = 310.0
 margin_bottom = 178.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
 popup_exclusive = true
 window_title = "blah"
-resizable = false
 script = ExtResource( 1 )
-_sections_unfolded = [ "Popup", "Rect" ]
 
-[node name="VBoxContainer" type="VBoxContainer" parent="." index="1"]
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
-
-anchor_left = 0.0
-anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
 
-[node name="TextEdit" type="TextEdit" parent="VBoxContainer" index="0"]
+[node name="TextEdit" type="TextEdit" parent="VBoxContainer"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_right = 310.0
 margin_bottom = 150.0
 rect_min_size = Vector2( 0, 150 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
 mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-text = ""
-readonly = false
-highlight_current_line = false
-syntax_highlighting = false
-show_line_numbers = false
-highlight_all_occurrences = false
-override_selected_font_color = false
-context_menu_enabled = true
-smooth_scrolling = false
-v_scroll_speed = 80.0
-hiding_enabled = 0
-wrap_lines = false
-caret_block_mode = false
-caret_blink = false
-caret_blink_speed = 0.65
-caret_moving_by_right_click = true
-_sections_unfolded = [ "Rect" ]
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer" index="1"]
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_left = 93.0
 margin_top = 154.0
 margin_right = 217.0
 margin_bottom = 174.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
 size_flags_horizontal = 4
 size_flags_vertical = 0
-alignment = 0
-_sections_unfolded = [ "Size Flags" ]
 
-[node name="OK" type="Button" parent="VBoxContainer/HBoxContainer" index="0"]
+[node name="OK" type="Button" parent="VBoxContainer/HBoxContainer"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_right = 60.0
 margin_bottom = 20.0
 rect_min_size = Vector2( 60, 0 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 text = "OK"
-flat = false
-align = 1
-_sections_unfolded = [ "Rect" ]
 
-[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer" index="1"]
+[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_left = 64.0
 margin_right = 124.0
 margin_bottom = 20.0
 rect_min_size = Vector2( 60, 0 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 text = "Cancel"
-flat = false
-align = 1
-_sections_unfolded = [ "Rect" ]
-
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/OK" to="." method="_on_OK_pressed"]
-
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="queue_free"]