summaryrefslogtreecommitdiff
path: root/tools/editor/editor_node.h
diff options
context:
space:
mode:
Diffstat (limited to 'tools/editor/editor_node.h')
-rw-r--r--tools/editor/editor_node.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index 18a88f63bb..db589bb1c3 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -366,6 +366,8 @@ private:
String open_navigate;
bool changing_scene;
+ bool waiting_for_sources_changed;
+
uint32_t circle_step_msec;
uint64_t circle_step_frame;
int circle_step;
@@ -464,6 +466,7 @@ private:
void _add_to_recent_scenes(const String& p_scene);
void _update_recent_scenes();
void _open_recent_scene(int p_idx);
+ void _dropped_files(const Vector<String>& p_files,int p_screen);
//void _open_recent_scene_confirm();
String _recent_scene;
@@ -607,6 +610,8 @@ public:
void save_resource(const Ref<Resource>& p_resource);
void save_resource_as(const Ref<Resource>& p_resource, const String &p_at_path=String());
+ void merge_from_scene() { _menu_option_confirm(FILE_IMPORT_SUBSCENE,false); }
+
static bool has_unsaved_changes() { return singleton->unsaved_cache; }
static HBoxContainer *get_menu_hb() { return singleton->menu_hb; }