From 0b3424be804ebbbc25ed97838f522c32ce202cb4 Mon Sep 17 00:00:00 2001 From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com> Date: Wed, 28 Apr 2021 04:00:40 +0300 Subject: [PATCH] Make selection tool scenes inherit from SelectionTool.tscn Useful for them to be able to share common tool options --- src/Tools/SelectionTools/ColorSelect.tscn | 15 +-------------- src/Tools/SelectionTools/MagicWand.tscn | 15 +-------------- src/Tools/SelectionTools/RectSelect.tscn | 15 +-------------- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/src/Tools/SelectionTools/ColorSelect.tscn b/src/Tools/SelectionTools/ColorSelect.tscn index 6ca3f6fd8..e5c7a5953 100644 --- a/src/Tools/SelectionTools/ColorSelect.tscn +++ b/src/Tools/SelectionTools/ColorSelect.tscn @@ -1,20 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/Tools/SelectionTools/SelectionTool.tscn" type="PackedScene" id=1] [ext_resource path="res://src/Tools/SelectionTools/ColorSelect.gd" type="Script" id=2] [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) - -[node name="PixelPerfect" parent="." index="1"] -visible = false - -[node name="EmptySpacer" parent="." index="2"] -visible = false -margin_top = 18.0 -margin_bottom = 30.0 - -[node name="Mirror" parent="." index="3"] -visible = false -margin_top = 18.0 -margin_bottom = 35.0 diff --git a/src/Tools/SelectionTools/MagicWand.tscn b/src/Tools/SelectionTools/MagicWand.tscn index 9017f8286..1b193ba74 100644 --- a/src/Tools/SelectionTools/MagicWand.tscn +++ b/src/Tools/SelectionTools/MagicWand.tscn @@ -1,20 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/Tools/SelectionTools/SelectionTool.tscn" type="PackedScene" id=1] [ext_resource path="res://src/Tools/SelectionTools/MagicWand.gd" type="Script" id=2] [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) - -[node name="PixelPerfect" parent="." index="1"] -visible = false - -[node name="EmptySpacer" parent="." index="2"] -visible = false -margin_top = 18.0 -margin_bottom = 30.0 - -[node name="Mirror" parent="." index="3"] -visible = false -margin_top = 18.0 -margin_bottom = 35.0 diff --git a/src/Tools/SelectionTools/RectSelect.tscn b/src/Tools/SelectionTools/RectSelect.tscn index 97b8de8ea..683b19e5d 100644 --- a/src/Tools/SelectionTools/RectSelect.tscn +++ b/src/Tools/SelectionTools/RectSelect.tscn @@ -1,20 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/Tools/SelectionTools/SelectionTool.tscn" type="PackedScene" id=1] [ext_resource path="res://src/Tools/SelectionTools/RectSelect.gd" type="Script" id=2] [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) - -[node name="PixelPerfect" parent="." index="1"] -visible = false - -[node name="EmptySpacer" parent="." index="2"] -visible = false -margin_top = 18.0 -margin_bottom = 30.0 - -[node name="Mirror" parent="." index="3"] -visible = false -margin_top = 18.0 -margin_bottom = 35.0