diff options
| -rw-r--r-- | core/string/ustring.cpp | 5 | ||||
| -rw-r--r-- | servers/rendering_server.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index d630e987ea..fee168993b 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -4285,7 +4285,10 @@ bool String::is_rel_path() const { } String String::get_base_dir() const { - int basepos = find("://"); + int basepos = find(":/"); + if (basepos == -1) { + basepos = find(":\\"); + } String rs; String base; if (basepos != -1) { diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 0a3e82ea22..dedca4b09f 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -1655,6 +1655,10 @@ void RenderingServer::_bind_methods() { ClassDB::bind_method(D_METHOD("viewport_get_render_info", "viewport", "info"), &RenderingServer::viewport_get_render_info); ClassDB::bind_method(D_METHOD("viewport_set_debug_draw", "viewport", "draw"), &RenderingServer::viewport_set_debug_draw); + ClassDB::bind_method(D_METHOD("viewport_set_measure_render_time", "viewport", "enable"), &RenderingServer::viewport_set_measure_render_time); + ClassDB::bind_method(D_METHOD("viewport_get_measured_render_time_cpu", "viewport"), &RenderingServer::viewport_get_measured_render_time_cpu); + ClassDB::bind_method(D_METHOD("viewport_get_measured_render_time_gpu", "viewport"), &RenderingServer::viewport_get_measured_render_time_gpu); + ClassDB::bind_method(D_METHOD("environment_create"), &RenderingServer::environment_create); ClassDB::bind_method(D_METHOD("environment_set_background", "env", "bg"), &RenderingServer::environment_set_background); ClassDB::bind_method(D_METHOD("environment_set_sky", "env", "sky"), &RenderingServer::environment_set_sky); |