Merge pull request #12301 from MarianoGnu/master

Implement auto-tiling

1 files changed, 6 insertions, 2 deletions

diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index 921ba529a2..20dda8b695 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -4724,9 +4724,9 @@ VSplitContainer *SpatialEditor::get_shader_split() {
 	return shader_split;
 }
 
-HSplitContainer *SpatialEditor::get_palette_split() {
+HBoxContainer *SpatialEditor::get_palette_split() {
 
-	return palette_split;
+	return palette_split_container;
 }
 
 void SpatialEditor::_request_gizmo(Object *p_obj) {
@@ -5017,6 +5017,10 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 	palette_split->set_v_size_flags(SIZE_EXPAND_FILL);
 	vbc->add_child(palette_split);
 
+	palette_split_container = memnew(HBoxContainer);
+	palette_split_container->set_v_size_flags(SIZE_EXPAND_FILL);
+	palette_split->add_child(palette_split_container);
+
 	shader_split = memnew(VSplitContainer);
 	shader_split->set_h_size_flags(SIZE_EXPAND_FILL);
 	palette_split->add_child(shader_split);