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/editor_node.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/editor_node.h')
| -rw-r--r-- | tools/editor/editor_node.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 53e16d9c5..d52e08191 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -107,6 +107,7 @@ class EditorNode : public Node { enum MenuOptions { FILE_NEW_SCENE, + FILE_NEW_INHERITED_SCENE, FILE_OPEN_SCENE, FILE_SAVE_SCENE, FILE_SAVE_AS_SCENE, @@ -565,7 +566,7 @@ public: void fix_dependencies(const String& p_for_file); void clear_scene() { _cleanup_scene(); } - Error load_scene(const String& p_scene,bool p_ignore_broken_deps=false); + Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false); Error load_resource(const String& p_scene); bool is_scene_open(const String& p_path); |