Merge branch 'blender-v3.1-release'

JannesN · Feb 16, 2022 · 3f0e63f · 3f0e63f
2 parents 86762e8 + 5497212
commit 3f0e63f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;
     }
   }