diff options
| author | Juan Linietsky | 2015-10-17 10:30:08 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-10-17 10:30:08 -0300 |
| commit | 63033aa646f7a49fbcecbc8cc30077cf268be10c (patch) | |
| tree | 80ccf1aed83e6c4d3ed1db2e1d2c0258090f7339 /tools/editor/scene_tree_editor.h | |
| parent | ab22203791489df160c36a29a3cd8aa8b32bec04 (diff) | |
| parent | 0d2b28377f1257af039c088f30c11aa0d12cc695 (diff) | |
| download | godot-63033aa646f7a49fbcecbc8cc30077cf268be10c.tar.gz godot-63033aa646f7a49fbcecbc8cc30077cf268be10c.tar.zst godot-63033aa646f7a49fbcecbc8cc30077cf268be10c.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/scene_tree_editor.h')
| -rw-r--r-- | tools/editor/scene_tree_editor.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_editor.h b/tools/editor/scene_tree_editor.h index b05a52a2d..50cca4e24 100644 --- a/tools/editor/scene_tree_editor.h +++ b/tools/editor/scene_tree_editor.h @@ -52,16 +52,22 @@ class SceneTreeEditor : public Control { }; enum { - SCENE_MENU_SHOW_CHILDREN, + SCENE_MENU_EDITABLE_CHILDREN, + SCENE_MENU_USE_PLACEHOLDER, SCENE_MENU_OPEN, + SCENE_MENU_CLEAR_INHERITANCE, + SCENE_MENU_OPEN_INHERITED, + SCENE_MENU_CLEAR_INHERITANCE_CONFIRM, }; Tree *tree; Node *selected; PopupMenu *instance_menu; + PopupMenu *inheritance_menu; ObjectID instance_node; AcceptDialog *error; + ConfirmationDialog *clear_inherit_confirm; int blocked; |