diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-10-18 16:43:37 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2022-10-18 19:01:48 +0200 |
| commit | e48c5daddfa70172c0eab57b8045a7087eec6e2c (patch) | |
| tree | 249fa2203570136d3a2040ad612e6e86a516cd5f /scene/main | |
| parent | 28a4eec9a77bc797b7147be2453cdbe85cf47d7f (diff) | |
Unify usage of GLOBAL/EDITOR_GET
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/node.cpp | 2 | ||||
| -rw-r--r-- | scene/main/scene_tree.cpp | 4 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 2ea45df309..689fdb17c6 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2947,7 +2947,7 @@ void Node::_bind_methods() { } String Node::_get_name_num_separator() { - switch (ProjectSettings::get_singleton()->get("editor/node_naming/name_num_separator").operator int()) { + switch (GLOBAL_GET("editor/node_naming/name_num_separator").operator int()) { case 0: return ""; case 1: diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 270e5b7025..e6ac123dcb 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -485,7 +485,7 @@ bool SceneTree::process(double p_time) { #ifndef _3D_DISABLED if (Engine::get_singleton()->is_editor_hint()) { //simple hack to reload fallback environment if it changed from editor - String env_path = ProjectSettings::get_singleton()->get(SNAME("rendering/environment/defaults/default_environment")); + String env_path = GLOBAL_GET(SNAME("rendering/environment/defaults/default_environment")); env_path = env_path.strip_edges(); //user may have added a space or two String cpath; Ref<Environment> fallback = get_root()->get_world_3d()->get_fallback_environment(); @@ -1387,7 +1387,7 @@ SceneTree::SceneTree() { root = memnew(Window); root->set_process_mode(Node::PROCESS_MODE_PAUSABLE); root->set_name("root"); - root->set_title(ProjectSettings::get_singleton()->get("application/config/name")); + root->set_title(GLOBAL_GET("application/config/name")); #ifndef _3D_DISABLED if (!root->get_world_3d().is_valid()) { diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index a2963eadd5..82a1301d71 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1261,7 +1261,7 @@ void Viewport::_gui_show_tooltip() { tooltip_owner->add_child(gui.tooltip_popup); - Point2 tooltip_offset = ProjectSettings::get_singleton()->get("display/mouse_cursor/tooltip_position_offset"); + Point2 tooltip_offset = GLOBAL_GET("display/mouse_cursor/tooltip_position_offset"); Rect2 r(gui.tooltip_pos + tooltip_offset, gui.tooltip_popup->get_contents_minimum_size()); Window *window = gui.tooltip_popup->get_parent_visible_window(); |