From ef89c650b298dbb536e49e34a2936ed9f346fa17 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sun, 24 May 2020 00:32:20 +0300 Subject: [PATCH] Fixed TextureRect images of the circle brushes in BrushesPopup They all had the pixel brush image in their TextureRect --- src/UI/BrushesPopup.tscn | 50 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/src/UI/BrushesPopup.tscn b/src/UI/BrushesPopup.tscn index 7217e68..3b02180 100644 --- a/src/UI/BrushesPopup.tscn +++ b/src/UI/BrushesPopup.tscn @@ -1,7 +1,37 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/UI/BrushButton.tscn" type="PackedScene" id=2] +[sub_resource type="Image" id=5] +data = { +"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0 ), +"format": "LumAlpha8", +"height": 9, +"mipmaps": false, +"width": 9 +} + +[sub_resource type="ImageTexture" id=2] +flags = 3 +flags = 3 +image = SubResource( 5 ) +size = Vector2( 9, 9 ) + +[sub_resource type="Image" id=6] +data = { +"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0 ), +"format": "LumAlpha8", +"height": 9, +"mipmaps": false, +"width": 9 +} + +[sub_resource type="ImageTexture" id=4] +flags = 3 +flags = 3 +image = SubResource( 6 ) +size = Vector2( 9, 9 ) + [node name="BrushesPopup" type="Popup"] margin_right = 226.0 margin_bottom = 144.0 @@ -34,21 +64,27 @@ hint_tooltip = "Pixel brush" mouse_default_cursor_shape = 2 [node name="CircleBrushButton" parent="TabContainer/File/FileBrushContainer" instance=ExtResource( 2 )] -margin_left = 35.0 -margin_right = 67.0 +margin_left = 36.0 +margin_right = 68.0 hint_tooltip = "Filled circle brush" mouse_default_cursor_shape = 2 brush_type = 1 custom_brush_index = -2 +[node name="BrushTexture" parent="TabContainer/File/FileBrushContainer/CircleBrushButton" index="0"] +texture = SubResource( 2 ) + [node name="FilledCircleBrushButton" parent="TabContainer/File/FileBrushContainer" instance=ExtResource( 2 )] -margin_left = 70.0 -margin_right = 102.0 +margin_left = 72.0 +margin_right = 104.0 hint_tooltip = "Circle brush" mouse_default_cursor_shape = 2 brush_type = 2 custom_brush_index = -1 +[node name="BrushTexture" parent="TabContainer/File/FileBrushContainer/FilledCircleBrushButton" index="0"] +texture = SubResource( 4 ) + [node name="Project" type="ScrollContainer" parent="TabContainer"] visible = false anchor_right = 1.0 @@ -63,3 +99,7 @@ scroll_horizontal_enabled = false [node name="ProjectBrushContainer" type="GridContainer" parent="TabContainer/Project"] columns = 5 + +[editable path="TabContainer/File/FileBrushContainer/CircleBrushButton"] + +[editable path="TabContainer/File/FileBrushContainer/FilledCircleBrushButton"]