godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Rename uniform to parameter across the engine

Browse Source
This commit is contained in:
Yuri Rubinsky
2022-08-27 12:22:43 +03:00
parent 1c037c89d4
commit 8191b3c110
80 changed files with 1523 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@@ -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