diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-11 14:18:29 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-11 14:18:29 -0600 |
| commit | 74645109c4be874538571406893231eb7247f18a (patch) | |
| tree | 45f914e7d6b6b60f76a3bc9d5df59186fa6bec3b /scene/resources | |
| parent | c8ff7880524e28e4e025f4e4e633218694ffc058 (diff) | |
| parent | a4d1d36c85dfdc6f281380ca9557acf0d7e76ce2 (diff) | |
| download | redot-engine-74645109c4be874538571406893231eb7247f18a.tar.gz | |
Merge pull request #98767 from jadeharley2/master
Fix inability to set TextureLayeredRD as `TEXTURE_TYPE_CUBE` or `TEXTURE_TYPE_CUBE_ARRAY`
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/texture_rd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/texture_rd.cpp b/scene/resources/texture_rd.cpp index 531dbcbe7e..8e7eeb0ff4 100644 --- a/scene/resources/texture_rd.cpp +++ b/scene/resources/texture_rd.cpp @@ -197,7 +197,7 @@ void TextureLayeredRD::_set_texture_rd_rid(RID p_texture_rd_rid) { RS::TextureLayeredType rs_layer_type; RD::TextureFormat tf = RD::get_singleton()->texture_get_format(p_texture_rd_rid); - ERR_FAIL_COND(tf.texture_type != RD::TEXTURE_TYPE_2D_ARRAY); + ERR_FAIL_COND(tf.texture_type != RD::TEXTURE_TYPE_2D_ARRAY && tf.texture_type != RD::TEXTURE_TYPE_CUBE && tf.texture_type != RD::TEXTURE_TYPE_CUBE_ARRAY); ERR_FAIL_COND(tf.depth > 1); switch (layer_type) { case LAYERED_TYPE_2D_ARRAY: { |