godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #12301 from MarianoGnu/master

Browse Source 
Implement auto-tiling
This commit is contained in:
Rémi Verschelde
2017-11-22 15:31:46 +01:00
committed by GitHub
parent 012b397063 bcfb0a09f8
commit e38efe22c7
10 changed files with 1990 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/spatial_editor_plugin.cpp
View File

@@ -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);