Fix theme merge

RodZill4 · Feb 12, 2025 · f1c6df0 · f1c6df0
1 parent a8d54db
commit f1c6df0
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/material_maker/theme/default.tres b/material_maker/theme/default.tres
@@ -1,5 +1,4 @@
-[gd_resource type="Theme" load_steps=123 format=3 uid="uid://b628lwfk6ig2c"]
-[gd_resource type="Theme" load_steps=132 format=3 uid="uid://b628lwfk6ig2c"]
+[gd_resource type="Theme" load_steps=133 format=3 uid="uid://b628lwfk6ig2c"]
 
 [ext_resource type="FontFile" uid="uid://dgkwr5jydtk6p" path="res://material_maker/theme/font_rubik/Rubik-VariableFont_wght.ttf" id="1_5tfb1"]
 [ext_resource type="Texture2D" uid="uid://1s0c37uoj4rf" path="res://material_maker/theme/default_theme_icons.svg" id="1_s43fy"]
@@ -350,7 +349,7 @@ region = Rect2(64, 128, 16, 16)
 metadata/scale = 1.0
 metadata/recolor = true
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_8uenv"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_86qok"]
 atlas = ExtResource("1_s43fy")
 region = Rect2(32, 96, 16, 16)
 
@@ -366,10 +365,6 @@ region = Rect2(32, 48, 16, 16)
 atlas = ExtResource("1_s43fy")
 region = Rect2(48, 48, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_pkv4t"]
-atlas = ExtResource("1_s43fy")
-region = Rect2(64, 160, 16, 16)
-
 [sub_resource type="AtlasTexture" id="AtlasTexture_agwde"]
 atlas = ExtResource("1_s43fy")
 region = Rect2(32, 16, 16, 16)
@@ -1044,11 +1039,10 @@ MM_FlexibleTab/icons/undock = SubResource("AtlasTexture_gvlse")
 MM_Icons/icons/2D_preview = SubResource("AtlasTexture_1yu4y")
 MM_Icons/icons/3D_preview = SubResource("AtlasTexture_ao7ds")
 MM_Icons/icons/3D_preview_control = SubResource("AtlasTexture_hht3q")
-MM_Icons/icons/add_image = SubResource("AtlasTexture_8uenv")
+MM_Icons/icons/add_image = SubResource("AtlasTexture_86qok")
 MM_Icons/icons/arrange_nodes = SubResource("AtlasTexture_60g77")
 MM_Icons/icons/arrow_left = SubResource("AtlasTexture_q32qs")
 MM_Icons/icons/arrow_right = SubResource("AtlasTexture_r3xak")
-MM_Icons/icons/color_picker = SubResource("AtlasTexture_pkv4t")
 MM_Icons/icons/delete = SubResource("AtlasTexture_agwde")
 MM_Icons/icons/draw = SubResource("AtlasTexture_oy0ko")
 MM_Icons/icons/dropdown = SubResource("AtlasTexture_2gawd")