summaryrefslogtreecommitdiffstats
path: root/editor/editor_node.h
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-02-10 14:31:29 +0100
committerGitHub <noreply@github.com>2021-02-10 14:31:29 +0100
commitb1c60c757f55e300b2fccc457f0ea15b095dbec4 (patch)
tree07e828732de4f93f4431cc37677793bae9a2444a /editor/editor_node.h
parentbad2998fea7c5b13688a507de76f8925210a9bf0 (diff)
parentc390c82014c23d7396cec731fceb515a354fe752 (diff)
downloadredot-engine-b1c60c757f55e300b2fccc457f0ea15b095dbec4.tar.gz
Merge pull request #31747 from KoBeWi/scene_stalking
Detect external modification of scenes
Diffstat (limited to 'editor/editor_node.h')
-rw-r--r--editor/editor_node.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 356ac0caac..3785d29c41 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -422,6 +422,9 @@ private:
Label *version_label;
Button *bottom_panel_raise;
+ Tree *disk_changed_list;
+ ConfirmationDialog *disk_changed;
+
void _bottom_panel_raise_toggled(bool);
EditorInterface *editor_interface;
@@ -641,6 +644,10 @@ private:
static void _resource_loaded(RES p_resource, const String &p_path);
void _resources_changed(const Vector<String> &p_resources);
+ void _scan_external_changes();
+ void _reload_modified_scenes();
+ void _reload_project_settings();
+ void _resave_scenes(String p_str);
void _feature_profile_changed();
bool _is_class_editor_disabled_by_feature_profile(const StringName &p_class);
@@ -741,7 +748,7 @@ public:
void fix_dependencies(const String &p_for_file);
void clear_scene() { _cleanup_scene(); }
int new_scene();
- Error load_scene(const String &p_scene, bool p_ignore_broken_deps = false, bool p_set_inherited = false, bool p_clear_errors = true, bool p_force_open_imported = false);
+ Error load_scene(const String &p_scene, bool p_ignore_broken_deps = false, bool p_set_inherited = false, bool p_clear_errors = true, bool p_force_open_imported = false, bool p_silent_change_tab = false);
Error load_resource(const String &p_resource, bool p_ignore_broken_deps = false);
bool is_scene_open(const String &p_path);