diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-07-28 20:34:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-28 20:34:17 +0200 |
commit | 8e0f328a80a4c01bc4788a9aa6daaeb3097b4fab (patch) | |
tree | cd8ed89c8e953679ce42aa01925b4e9861137ec1 /main | |
parent | 1c820f19b1a0ba72316896ad354cb31391638a3b (diff) | |
parent | 4b42379c8fb89c28a8c38e79ac3573f5b34f8fb4 (diff) |
Merge pull request #59840 from Calinou/renderingserver-global-uniform-rename
Diffstat (limited to 'main')
-rw-r--r-- | main/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 3e29323337..a9037806bf 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2098,7 +2098,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { // able to load resources, load the global shader variables. // If running on editor, don't load the textures because the editor // may want to import them first. Editor will reload those later. - rendering_server->global_variables_load_settings(!editor); + rendering_server->global_shader_uniforms_load_settings(!editor); } _start_success = true; @@ -3011,7 +3011,7 @@ void Main::cleanup(bool p_force) { RenderingServer::get_singleton()->sync(); //clear global shader variables before scene and other graphics stuff are deinitialized. - rendering_server->global_variables_clear(); + rendering_server->global_shader_uniforms_clear(); if (xr_server) { // Now that we're unregistering properly in plugins we need to keep access to xr_server for a little longer |