mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Fix Resource deep duplicate sets image properties with invalid resources.
This commit is contained in:
parent
4ed8c45abd
commit
0d32849565
2 changed files with 17 additions and 3 deletions
|
|
@ -83,7 +83,13 @@ Ref<ImageTexture> ImageTexture::create_from_image(const Ref<Image> &p_image) {
|
|||
}
|
||||
|
||||
void ImageTexture::set_image(const Ref<Image> &p_image) {
|
||||
ERR_FAIL_COND_MSG(p_image.is_null() || p_image->is_empty(), "Invalid image");
|
||||
if (p_image.is_null() || p_image->is_empty()) {
|
||||
if (image_stored) {
|
||||
ERR_PRINT("Invalid image");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
w = p_image->get_width();
|
||||
h = p_image->get_height();
|
||||
format = p_image->get_format();
|
||||
|
|
@ -474,8 +480,13 @@ TypedArray<Image> ImageTexture3D::_get_images() const {
|
|||
}
|
||||
|
||||
void ImageTexture3D::_set_images(const TypedArray<Image> &p_images) {
|
||||
int new_layers = p_images.size();
|
||||
ERR_FAIL_COND(new_layers == 0);
|
||||
if (p_images.size() == 0) {
|
||||
if (images_stored) {
|
||||
ERR_PRINT("Invalid images");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
Ref<Image> img_base = p_images[0];
|
||||
ERR_FAIL_COND(img_base.is_null());
|
||||
|
||||
|
|
@ -504,6 +515,8 @@ void ImageTexture3D::_set_images(const TypedArray<Image> &p_images) {
|
|||
|
||||
Error err = _create(new_format, new_width, new_height, new_depth, new_mipmaps, p_images);
|
||||
ERR_FAIL_COND(err != OK);
|
||||
|
||||
images_stored = true;
|
||||
}
|
||||
|
||||
void ImageTexture3D::_bind_methods() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue