[Bf-blender-cvs] [3d96fd6fd65] blender-v3.2-release: Fix T97543: Changing multipass images doesn't update the image.
Jeroen Bakker
noreply at git.blender.org
Tue May 3 09:14:44 CEST 2022
Commit: 3d96fd6fd65c196c45750d17c81f6ebfce7d2a62
Author: Jeroen Bakker
Date: Tue May 3 09:10:17 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB3d96fd6fd65c196c45750d17c81f6ebfce7d2a62
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);
}
More information about the Bf-blender-cvs
mailing list