Merge branch 'blender-v3.1-release'

2022-02-16 11:16:22 +01:00
parent 86762e8371 54972123f7
commit 3f0e63fcca
1 changed files with 2 additions and 1 deletions
--- a/source/blender/blenkernel/intern/image_gpu.cc
+++ b/source/blender/blenkernel/intern/image_gpu.cc
@@ -431,7 +431,8 @@ static GPUTexture *image_get_gpu_texture(Image *ima,
  if (ibuf_intern == nullptr) {
    ibuf_intern = BKE_image_acquire_ibuf(ima, iuser, nullptr);
    if (ibuf_intern == nullptr) {
-      return image_gpu_texture_error_create(textarget);
+      *tex = image_gpu_texture_error_create(textarget);
+      return *tex;
    }
  }