diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-02 13:49:53 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-02 13:49:53 +0200 |
| commit | c82bbc38a51c3b3a66519babd26135abf2ce7d47 (patch) | |
| tree | 5d86f9962ebf8ca146234b4f6aed7823ec75c94a /main/main.cpp | |
| parent | 9142904c248cb4c9de8776f9abe995fc22335c2c (diff) | |
| parent | 8191b3c110260f086de390ff38ccc980474ef755 (diff) | |
Merge pull request #64952 from Chaosus/vs_rename_uniform_to_param
Diffstat (limited to 'main/main.cpp')
| -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 d0170d8093..a0d2f594ac 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2209,7 +2209,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_shader_uniforms_load_settings(!editor); + rendering_server->global_shader_parameters_load_settings(!editor); } _start_success = true; @@ -3136,7 +3136,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_shader_uniforms_clear(); + rendering_server->global_shader_parameters_clear(); if (xr_server) { // Now that we're unregistering properly in plugins we need to keep access to xr_server for a little longer |