diff options
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index c0c1171ae6..9e7b357d73 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -54,7 +54,7 @@ String Globals::localize_path(const String& p_path) const { if (resource_path=="") return p_path; //not initialied yet - if (p_path.find(":/") != -1) + if (p_path.begins_with("res://") || p_path.begins_with("user://")) return p_path.simplify_path(); @@ -82,6 +82,8 @@ String Globals::localize_path(const String& p_path) const { if (sep == -1) { return "res://"+path; }; + + String parent = path.substr(0, sep); String plocal = localize_path(parent); @@ -1526,6 +1528,7 @@ Globals::Globals() { custom_prop_info["render/thread_model"]=PropertyInfo(Variant::INT,"render/thread_model",PROPERTY_HINT_ENUM,"Single-Unsafe,Single-Safe,Multi-Threaded"); custom_prop_info["physics_2d/thread_model"]=PropertyInfo(Variant::INT,"physics_2d/thread_model",PROPERTY_HINT_ENUM,"Single-Unsafe,Single-Safe,Multi-Threaded"); + set("debug/profiler_max_functions",16384); using_datapack=false; } |