diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-09-15 10:28:35 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-09-15 10:29:58 +0300 |
commit | ac58663decabb25600862e7345377efe2da1ee92 (patch) | |
tree | ab9e1d6229eb721d96dcd7053557a147c0b38ff1 /source/blender/blenkernel/intern/image_gpu.c | |
parent | 91e32bff90866acbfceda3b96a3462a55f7ccb71 (diff) |
Fix T80776: Cannot switch between Slots of Render Result
Introduced by D8234. Added active render slot to determine if the GPUTexture is still up to date.
Diffstat (limited to 'source/blender/blenkernel/intern/image_gpu.c')
-rw-r--r-- | source/blender/blenkernel/intern/image_gpu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image_gpu.c b/source/blender/blenkernel/intern/image_gpu.c index 8e2e3fd621c..57e7e9446d2 100644 --- a/source/blender/blenkernel/intern/image_gpu.c +++ b/source/blender/blenkernel/intern/image_gpu.c @@ -277,9 +277,12 @@ static GPUTexture *image_get_gpu_texture(Image *ima, * the current `pass` and `layer` should be 0. */ short requested_pass = iuser ? iuser->pass : 0; short requested_layer = iuser ? iuser->layer : 0; - if (ima->gpu_pass != requested_pass || ima->gpu_layer != requested_layer) { + short requested_slot = ima->render_slot; + if (ima->gpu_pass != requested_pass || ima->gpu_layer != requested_layer || + ima->gpu_slot != requested_slot) { ima->gpu_pass = requested_pass; ima->gpu_layer = requested_layer; + ima->gpu_slot = requested_slot; ima->gpuflag |= IMA_GPU_REFRESH; } |