mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 22:00:10 +00:00
Fix wrong default texture for global uniforms of type sampler2DArray
This commit is contained in:
parent
d59994688c
commit
fa30719814
2 changed files with 10 additions and 2 deletions
|
|
@ -872,7 +872,11 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
|
|||
E->value = global_textures_pass;
|
||||
}
|
||||
|
||||
textures.push_back(v->override.get_type() != Variant::NIL ? v->override : v->value);
|
||||
if (v->override.get_type() == Variant::RID && ((RID)v->override).is_valid()) {
|
||||
textures.push_back(v->override);
|
||||
} else if (v->value.get_type() == Variant::RID && ((RID)v->value).is_valid()) {
|
||||
textures.push_back(v->value);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue