seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #45617 from RandomShaper/modernize_atomics

Browse Source 
Modernize atomics (and fix `volatile`)
This commit is contained in:
Rémi Verschelde
2021-02-18 19:40:31 +01:00
committed by GitHub
parent 7eb4e6415d 8e128726f0
commit 310496a89f
58 changed files with 650 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_file_system.cpp
View File

@ -1413,11 +1413,11 @@ void EditorFileSystem::_scan_script_classes(EditorFileSystemDirectory *p_dir) {
}
void EditorFileSystem::update_script_classes() {
if (!update_script_classes_queued) {
if (!update_script_classes_queued.is_set()) {
return;
}
update_script_classes_queued = false;
update_script_classes_queued.clear();
ScriptServer::global_classes_clear();
if (get_filesystem()) {
_scan_script_classes(get_filesystem());
@ -1436,11 +1436,11 @@ void EditorFileSystem::update_script_classes() {
}
void EditorFileSystem::_queue_update_script_classes() {
if (update_script_classes_queued) {
if (update_script_classes_queued.is_set()) {
return;
}
update_script_classes_queued = true;
update_script_classes_queued.set();
call_deferred("update_script_classes");
}
@ -2091,7 +2091,7 @@ EditorFileSystem::EditorFileSystem() {
memdelete(da);
scan_total = 0;
update_script_classes_queued = false;
update_script_classes_queued.clear();
first_scan = true;
scan_changes_pending = false;
revalidate_import_files = false;