summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-07-24 17:18:12 +0200
committerGitHub <noreply@github.com>2021-07-24 17:18:12 +0200
commit2b1e6e303ed6b0e2ca408f2156b745e711c2bab7 (patch)
tree0ec902365a812d3cd8c449cd3983df48e10feb1a /main
parent96d7bc62af25b85b8b9cc091eeea1e7a784ba624 (diff)
parent32b43cfeb38dc83ba8024acec32bdfc706c86a46 (diff)
Merge pull request #50786 from reduz/implement-resource-uids
Implement Resource UIDs
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 1ad9a16992..02c3dffd11 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1089,6 +1089,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
// Initialize user data dir.
OS::get_singleton()->ensure_user_data_dir();
+ ResourceUID::get_singleton()->load_from_cache(); // load UUIDs from cache.
+
GLOBAL_DEF("memory/limits/multithreaded_server/rid_pool_prealloc", 60);
ProjectSettings::get_singleton()->set_custom_property_info("memory/limits/multithreaded_server/rid_pool_prealloc",
PropertyInfo(Variant::INT,