diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 13:15:58 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 13:15:58 +0100 |
| commit | 5947f22be9441b3b4d41604af8301515558d0f03 (patch) | |
| tree | 7323e3023e0519d23bcf4ca23b8990c3363d6a99 /drivers/gles3/storage | |
| parent | 9cfcc9131fc03693893e0ed2ac19878c392a0125 (diff) | |
| parent | e48c5daddfa70172c0eab57b8045a7087eec6e2c (diff) | |
Merge pull request #67578 from KoBeWi/GEDITOR
Unify usage of GLOBAL/EDITOR_GET
Diffstat (limited to 'drivers/gles3/storage')
| -rw-r--r-- | drivers/gles3/storage/config.cpp | 2 | ||||
| -rw-r--r-- | drivers/gles3/storage/material_storage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gles3/storage/config.cpp b/drivers/gles3/storage/config.cpp index 943df3b156..97a6692166 100644 --- a/drivers/gles3/storage/config.cpp +++ b/drivers/gles3/storage/config.cpp @@ -105,7 +105,7 @@ Config::Config() { support_anisotropic_filter = extensions.has("GL_EXT_texture_filter_anisotropic"); if (support_anisotropic_filter) { glGetFloatv(_GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &anisotropic_level); - anisotropic_level = MIN(float(1 << int(ProjectSettings::get_singleton()->get("rendering/textures/default_filters/anisotropic_filtering_level"))), anisotropic_level); + anisotropic_level = MIN(float(1 << int(GLOBAL_GET("rendering/textures/default_filters/anisotropic_filtering_level"))), anisotropic_level); } multiview_supported = extensions.has("GL_OVR_multiview2") || extensions.has("GL_OVR_multiview"); diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp index 724ad57d64..6748eb3676 100644 --- a/drivers/gles3/storage/material_storage.cpp +++ b/drivers/gles3/storage/material_storage.cpp @@ -2214,7 +2214,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture for (const PropertyInfo &E : settings) { if (E.name.begins_with("shader_globals/")) { StringName name = E.name.get_slice("/", 1); - Dictionary d = ProjectSettings::get_singleton()->get(E.name); + Dictionary d = GLOBAL_GET(E.name); ERR_CONTINUE(!d.has("type")); ERR_CONTINUE(!d.has("value")); |