diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-02-16 13:16:22 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-02-16 13:16:22 +0300 |
| commit | 3f0e63fcca02c6fbdc2fdafa408fc36dcf451e45 (patch) | |
| tree | 567d50c79710a5842acdf825bcc038ef75001787 /source/blender/blenkernel/intern/image_gpu.cc | |
| parent | 86762e8371ccecd411a463031d44618d4eec70ac (diff) | |
| parent | 54972123f73ac2d4674efc5fa07fbf372c5bb4f6 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/blenkernel/intern/image_gpu.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/image_gpu.cc | 3 |
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 5675641deb4..444cbbe4bf9 100644 --- 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; } } |