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

merging okam changes

This commit is contained in:
Juan Linietsky
2015-04-02 07:22:17 -03:00
parent ebd743f7c2
commit 1572238adb
9 changed files with 84 additions and 31 deletions

View File

@@ -46,6 +46,7 @@ class SpriteFramesEditor : public PanelContainer {
Button *_delete;
Button *paste;
Button *empty;
Button *empty2;
Button *move_up;
Button *move_down;
Tree *tree;
@@ -65,6 +66,7 @@ class SpriteFramesEditor : public PanelContainer {
void _file_load_request(const DVector<String>& p_path);
void _paste_pressed();
void _empty_pressed();
void _empty2_pressed();
void _delete_pressed();
void _delete_confirm_pressed();
void _up_pressed();