1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00

Merge pull request #12301 from MarianoGnu/master

Implement auto-tiling
This commit is contained in:
Rémi Verschelde
2017-11-22 15:31:46 +01:00
committed by GitHub
10 changed files with 1990 additions and 43 deletions

View File

@@ -412,6 +412,7 @@ private:
SpatialEditorViewport *viewports[VIEWPORTS_COUNT];
VSplitContainer *shader_split;
HSplitContainer *palette_split;
HBoxContainer *palette_split_container;
/////
@@ -606,7 +607,7 @@ public:
void add_control_to_menu_panel(Control *p_control);
VSplitContainer *get_shader_split();
HSplitContainer *get_palette_split();
HBoxContainer *get_palette_split();
Spatial *get_selected() { return selected; }