[Bf-blender-cvs] [54972123f73] blender-v3.1-release: Fix Image GPU texture.

[Jeroen Bakker]

Commit: 54972123f73ac2d4674efc5fa07fbf372c5bb4f6
Author: Jeroen Bakker
Date:   Wed Feb 16 10:45:46 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB54972123f73ac2d4674efc5fa07fbf372c5bb4f6

Fix Image GPU texture.

Due to recent changes there have been reports of incorrect loading of
GPU textures. This fix reverts a part of {D13238} that might be the
source of the issue.

===================================================================

M	source/blender/blenkernel/intern/image_gpu.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/image_gpu.cc b/source/blender/blenkernel/intern/image_gpu.cc
index c43df7e157e..42dcfcd7aa9 100644
--- a/source/blender/blenkernel/intern/image_gpu.cc
+++ b/source/blender/blenkernel/intern/image_gpu.cc
@@ -447,7 +447,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;
     }
   }