Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-02-16 12:45:46 +0300
committerJeroen Bakker <jeroen@blender.org>2022-02-16 12:45:46 +0300
commit54972123f73ac2d4674efc5fa07fbf372c5bb4f6 (patch)
tree8509b88a30abd5cc53fdbdb68ebe18c31fe4803a /source/blender/blenkernel/intern
parent232d5d3f13479b5bddd44e3e73c94a2b419ea0fa (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/image_gpu.cc3
1 files changed, 2 insertions, 1 deletions
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;
}
}