summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Conway <dylan.conway567@gmail.com>2022-07-06 21:09:07 -0700
committerDylan Conway <dylan.conway567@gmail.com>2022-07-07 11:11:47 -0700
commit78ca147c8a4a3849188b922782de3c16a6aad4b4 (patch)
treefc2de00adc2ebcad7e154c1531721e05ca7d8157
parent09e12ba9b46934c32ffc9e178b5c6f0348de809f (diff)
Changed valid check to null check, added error messages
-rw-r--r--scene/resources/texture.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index f31a71eada..e58ef68388 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -3016,12 +3016,12 @@ Error ImageTextureLayered::create_from_images(Vector<Ref<Image>> p_images) {
}
void ImageTextureLayered::update_layer(const Ref<Image> &p_image, int p_layer) {
- ERR_FAIL_COND(texture.is_valid());
- ERR_FAIL_COND(p_image.is_null());
- ERR_FAIL_COND(p_image->get_format() != format);
- ERR_FAIL_COND(p_image->get_width() != width || p_image->get_height() != height);
- ERR_FAIL_INDEX(p_layer, layers);
- ERR_FAIL_COND(p_image->has_mipmaps() != mipmaps);
+ ERR_FAIL_COND_MSG(texture.is_null(), "Texture is not initialized.");
+ ERR_FAIL_COND_MSG(p_image.is_null(), "Invalid image.");
+ ERR_FAIL_COND_MSG(p_image->get_format() != format, "Image format must match texture's image format.");
+ ERR_FAIL_COND_MSG(p_image->get_width() != width || p_image->get_height() != height, "Image size must match texture's image size.");
+ ERR_FAIL_COND_MSG(p_image->has_mipmaps() != mipmaps, "Image mipmap configuration must match texture's image mipmap configuration.");
+ ERR_FAIL_INDEX_MSG(p_layer, layers, "Layer index is out of bounds.");
RS::get_singleton()->texture_2d_update(texture, p_image, p_layer);
}