godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54043 from Chaosus/fix_shader_uniform_texture_array_errors

This commit is contained in:
Yuri Roubinsky 2021-10-20 23:37:57 +03:00 committed by GitHub
parent 8474bb0a3c 5a354aaf6d
commit dc81583fb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/rendering/renderer_rd/renderer_storage_rd.cpp
View File

@ -2672,9 +2672,11 @@ void RendererStorageRD::MaterialData::update_textures(const Map<StringName, Vari
if (uniform_array_size > 0) {
if (textures.size() < uniform_array_size) {
const Map<StringName, RID>::Element *W = p_default_textures.find(uniform_name);
if (W) {
for (int j = textures.size(); j < uniform_array_size; j++) {
for (int j = textures.size(); j < uniform_array_size; j++) {
if (W) {
textures.push_back(W->get());
} else {
textures.push_back(RID());
}
}
}