Detect external modification of scenes #31747

KoBeWi · 2019-08-28T19:20:22Z

With this change, editor will look for external modifications in opened scenes when focused and asks for reload. This is analogical to scripts in ScriptEditorPlugin.

Closes #11803
Also closes #20250, which is a duplicate
Also closes #22450, which is a duplicate duplicate

KoBeWi · 2019-10-29T01:57:44Z

I finally got around to fixing this and the crash is gone (not sure if related to what I did xd). Also the reloading is more seamless, there's no undo history noise at all.

Probably needs some testing, but otherwise, the PR complete. I'd really like it for 3.2 >_>

akien-mga · 2019-10-30T10:14:59Z

We're a bit too close to 3.2-stable for such a change IMO, so I'd prefer to merge after the release. We can cherry-pick for 3.2 though if it proves to work well in the master branch.

alexzheng · 2020-03-10T03:42:30Z

Why such a nice feature still not available in the latest release?
Scene can not be reload automatically will overwrite the external modification.

editor/editor_node.cpp

KoBeWi · 2020-06-09T15:05:53Z

Ok, rebased and fixed. However due to #37531, the dialog will pop up infinitely when you try to cancel/close it (because editor gets refocused), so you are either forced to save scene or reload.

Dragoncraft89 · 2020-09-26T23:20:13Z

As far as I can tell from the diff, this only takes into account open scenes, right?

But these are not the only files, that need to be reloaded. The project.godot file faces similar problems, although fixing that could be a lot more difficult

Zylann · 2020-10-03T17:31:37Z

Note that the user can have more than just scenes open. What's on disk are resources, so it's actually about resources. Resources can be scripts, scenes, or standalone resources open in the inspector. Is the latter handled as well?

KoBeWi · 2020-10-03T17:38:17Z

Resources in Godot are usually built-in, so this PR handles most of the problems. But I didn't test file Resources, they might indeed be a problem. project.godot is not handled yet either.

Zylann · 2020-10-03T17:56:09Z

Resources in Godot are usually built-in

No? I dunno what that comes from (we dont have stats?) but there are a bunch of cases where resources authored inside Godot are files (themes, custom resources, some materials, default environment, scripts, audio bus layout...). I also use lots of file resources myself, and actually rarely make them builtin.

KoBeWi · 2020-10-03T18:24:39Z

Dunno, 99% of non-imported resources in my project are built-in (they are mostly collision shapes). Script changes are already handled by script editor.

KoBeWi · 2021-01-17T00:10:47Z

I rebased the PR. Also I added detecting changes to project.godot, but right now it's useless due to #45243 (I tested with the mentioned lines commented out and it works)

KoBeWi · 2021-02-09T12:18:33Z

Ah, I forgot to write here, but I tested this PR during the GGJ and it works fine.

There are two problems though:

ProjectSettings are saved (twice) on each editor focus #45243
built-in scripts aren't properly reloaded when the containing scene is instanced in another opened scene

However they are separate issues not really related to this PR. I'd say it's ready to be merged.

core/config/project_settings.cpp

core/config/project_settings.h

editor/editor_data.h

editor/editor_node.cpp

Changes done.

akien-mga · 2021-02-10T13:31:34Z

Thanks!

akien-mga · 2021-02-10T16:19:06Z

editor/editor_node.cpp

+		disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_modified_scenes));
+		disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_project_settings));


You're connecting two callables to the same signal, bug?

No, this is intended. I made reloading scenes and project settings into separate methods.

akien-mga · 2021-02-10T23:15:12Z

If you're up for it, I'd suggest making a dedicated backport PR for 3.2, as the cherry-picking needs some care and proper testing to make sure that going back to _bind_methods for callbacks, etc. works as intended.

KoBeWi force-pushed the scene_stalking branch from 5989978 to 8f27164 Compare August 28, 2019 20:02

akien-mga added enhancement topic:editor labels Sep 2, 2019

akien-mga added this to the 3.2 milestone Sep 2, 2019

KoBeWi marked this pull request as ready for review October 29, 2019 01:55

KoBeWi force-pushed the scene_stalking branch from 8f27164 to b0665c2 Compare October 29, 2019 01:55

akien-mga added the needs testing label Oct 30, 2019

akien-mga modified the milestones: 3.2, 4.0 Oct 30, 2019

akien-mga added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Oct 30, 2019

akien-mga reviewed Jun 9, 2020

View reviewed changes

editor/editor_node.cpp Outdated Show resolved Hide resolved

akien-mga reviewed Jun 9, 2020

View reviewed changes

editor/editor_node.cpp Outdated Show resolved Hide resolved

KoBeWi force-pushed the scene_stalking branch 2 times, most recently from c56ebd5 to 61a053c Compare June 9, 2020 15:04

aaronfranke added the for pr meeting label Jun 30, 2020

aaronfranke requested a review from akien-mga June 30, 2020 23:33

KoBeWi force-pushed the scene_stalking branch from 61a053c to 256bd52 Compare January 16, 2021 14:50

Detect external modification of scenes

412125f

KoBeWi force-pushed the scene_stalking branch from 256bd52 to 76c17cf Compare January 17, 2021 00:09

KoBeWi removed the needs testing label Feb 9, 2021

akien-mga reviewed Feb 9, 2021

View reviewed changes

core/config/project_settings.cpp Outdated Show resolved Hide resolved

akien-mga reviewed Feb 9, 2021

View reviewed changes

core/config/project_settings.h Show resolved Hide resolved

akien-mga reviewed Feb 9, 2021

View reviewed changes

editor/editor_data.h Outdated Show resolved Hide resolved

akien-mga requested a review from a team February 9, 2021 13:07

KoBeWi force-pushed the scene_stalking branch from 76c17cf to f699645 Compare February 9, 2021 13:23

Calinou previously requested changes Feb 9, 2021

View reviewed changes

editor/editor_node.cpp Outdated Show resolved Hide resolved

Detect external modification of project.godot

c390c82

KoBeWi force-pushed the scene_stalking branch from f699645 to c390c82 Compare February 9, 2021 13:44

akien-mga approved these changes Feb 10, 2021

View reviewed changes

akien-mga merged commit b1c60c7 into godotengine:master Feb 10, 2021

KoBeWi deleted the scene_stalking branch February 10, 2021 13:59

akien-mga reviewed Feb 10, 2021

View reviewed changes

KoBeWi mentioned this pull request Feb 11, 2021

[3.2] Detect external modification of scenes #45880

Merged

akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Feb 11, 2021

Calinou mentioned this pull request Feb 13, 2021

'The following files are newer on disk' dialog everytime project run #45958

Closed

NoFr1ends mentioned this pull request Feb 13, 2021

Warning about changed project file while having the project open multiple times #45965

Closed

raptdwar mentioned this pull request Feb 13, 2021

Custom Resource does not update in editor if changed/saved from script #24646

Closed

Calinou mentioned this pull request Mar 27, 2021

When Engine crashes, some project data is not persistent #47380

Open

Calinou removed the for pr meeting label Nov 19, 2021

Calinou mentioned this pull request Nov 19, 2021

Project setting changes aren't always saved to project.godot when pressing Ctrl + S #55145

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Detect external modification of scenes #31747

Detect external modification of scenes #31747

KoBeWi commented Aug 28, 2019 •

edited

Loading

KoBeWi commented Oct 29, 2019

akien-mga commented Oct 30, 2019

alexzheng commented Mar 10, 2020

KoBeWi commented Jun 9, 2020

Dragoncraft89 commented Sep 26, 2020

Zylann commented Oct 3, 2020 •

edited

Loading

KoBeWi commented Oct 3, 2020

Zylann commented Oct 3, 2020 •

edited

Loading

KoBeWi commented Oct 3, 2020

KoBeWi commented Jan 17, 2021

KoBeWi commented Feb 9, 2021 •

edited

Loading

akien-mga commented Feb 10, 2021

akien-mga Feb 10, 2021

KoBeWi Feb 10, 2021

akien-mga commented Feb 10, 2021

		disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_modified_scenes));
		disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_project_settings));

Detect external modification of scenes #31747

Detect external modification of scenes #31747

Conversation

KoBeWi commented Aug 28, 2019 • edited Loading

KoBeWi commented Oct 29, 2019

akien-mga commented Oct 30, 2019

alexzheng commented Mar 10, 2020

KoBeWi commented Jun 9, 2020

Dragoncraft89 commented Sep 26, 2020

Zylann commented Oct 3, 2020 • edited Loading

KoBeWi commented Oct 3, 2020

Zylann commented Oct 3, 2020 • edited Loading

KoBeWi commented Oct 3, 2020

KoBeWi commented Jan 17, 2021

KoBeWi commented Feb 9, 2021 • edited Loading

akien-mga commented Feb 10, 2021

akien-mga Feb 10, 2021

Choose a reason for hiding this comment

KoBeWi Feb 10, 2021

Choose a reason for hiding this comment

akien-mga commented Feb 10, 2021

KoBeWi commented Aug 28, 2019 •

edited

Loading

Zylann commented Oct 3, 2020 •

edited

Loading

Zylann commented Oct 3, 2020 •

edited

Loading

KoBeWi commented Feb 9, 2021 •

edited

Loading