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

Merge pull request #42046 from Chaosus/fix_default_texture

Browse Source 
Fix setting the default texture to shader
This commit is contained in:
Juan Linietsky 2020-10-19 15:50:21 -03:00 committed by GitHub
commit 5d120f9ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp
View File

@ -1256,6 +1256,10 @@ void RasterizerStorageRD::shader_set_code(RID p_shader, const String &p_code) {
} }
material->shader_type = new_type; material->shader_type = new_type;
} }
for (Map<StringName, RID>::Element *E = shader->default_texture_parameter.front(); E; E = E->next()) {
shader->data->set_default_texture_param(E->key(), E->get());
}
} }
if (shader->data) { if (shader->data) {
@ -1292,7 +1296,9 @@ void RasterizerStorageRD::shader_set_default_texture_param(RID p_shader, const S
} else { } else {
shader->default_texture_parameter.erase(p_name); shader->default_texture_parameter.erase(p_name);
} }
if (shader->data) {
shader->data->set_default_texture_param(p_name, p_texture);
}
for (Set<Material *>::Element *E = shader->owners.front(); E; E = E->next()) { for (Set<Material *>::Element *E = shader->owners.front(); E; E = E->next()) {
Material *material = E->get(); Material *material = E->get();
_material_queue_update(material, false, true); _material_queue_update(material, false, true);