[Bf-blender-cvs] [00fb44797a9] master: Fix T97543: Changing multipass images doesn't update the image.

[Jeroen Bakker]

Commit: 00fb44797a97b0202f36f2d517570e4df4c06bfc
Author: Jeroen Bakker
Date:   Tue May 3 09:10:17 2022 +0200
Branches: master
https://developer.blender.org/rB00fb44797a97b0202f36f2d517570e4df4c06bfc

Fix T97543: Changing multipass images doesn't update the image.

Code was partial migrated from the previous image engine. Missing multilayered
images.

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

M	source/blender/draw/engines/image/image_engine.cc

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

diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc
index e972d21cda4..a1a1de328f4 100644
--- a/source/blender/draw/engines/image/image_engine.cc
+++ b/source/blender/draw/engines/image/image_engine.cc
@@ -107,7 +107,12 @@ class ImageEngine {
     space->release_buffer(instance_data->image, image_buffer, lock);
 
     ImageUser *iuser = space->get_image_user();
-    BKE_image_multiview_index(instance_data->image, iuser);
+    if (instance_data->image->rr != nullptr) {
+      BKE_image_multilayer_index(instance_data->image->rr, iuser);
+    }
+    else {
+      BKE_image_multiview_index(instance_data->image, iuser);
+    }
     drawing_mode.cache_image(vedata, instance_data->image, iuser);
   }