diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-02-14 13:00:30 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-02-14 13:00:30 +0300 |
commit | 48e2bf3638e1d96d8cbfbc74d29c347ccfcad576 (patch) | |
tree | d40cb6b120a2a0718f68199556760c4398461fd2 /source/blender/blenkernel/intern/image_gpu.cc | |
parent | efac4db166292229e4e2ab7afa6034d637893bd6 (diff) | |
parent | 1236d2aea8d55c7d98409fc76968bad297a53007 (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 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/image_gpu.cc b/source/blender/blenkernel/intern/image_gpu.cc index a12ae2951f4..5675641deb4 100644 --- a/source/blender/blenkernel/intern/image_gpu.cc +++ b/source/blender/blenkernel/intern/image_gpu.cc @@ -389,18 +389,9 @@ static GPUTexture *image_get_gpu_texture(Image *ima, ima->gpu_pass = requested_pass; ima->gpu_layer = requested_layer; ima->gpu_view = requested_view; - ima->gpuflag |= IMA_GPU_REFRESH; } #undef GPU_FLAGS_TO_CHECK - /* TODO(jbakker): We should replace the IMA_GPU_REFRESH flag with a call to - * BKE_image-partial_update_mark_full_update. Although the flag is quicker it leads to double - * administration. */ - if ((ima->gpuflag & IMA_GPU_REFRESH) != 0) { - BKE_image_partial_update_mark_full_update(ima); - ima->gpuflag &= ~IMA_GPU_REFRESH; - } - if (ima->runtime.partial_update_user == nullptr) { ima->runtime.partial_update_user = BKE_image_partial_update_create(ima); } |