Commit: cb3005c2633dc3bea328b67a075709a8a1824fdd
Author: Jeroen Bakker
Date: Tue Mar 16 10:08:24 2021 +0100
Branches: master
https://developer.blender.org/rBcb3005c2633dc3bea328b67a075709a8a1824fdd
Fix: read cryptomatte manifests when images aren't loaded yet.
A check was preventing the actual image to load and was therefore not
parsed.
===================================================================
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
===================================================================
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index d81076c2fa6..ae4d565b292 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -80,10 +80,10 @@ static blender::bke::cryptomatte::CryptomatteSessionPtr
cryptomatte_init_from_no
case CMP_CRYPTOMATTE_SRC_IMAGE: {
Image *image = (Image *)node.id;
- BLI_assert(!image || GS(image->id.name) == ID_IM);
- if (!image || image->type != IMA_TYPE_MULTILAYER) {
+ if (!image) {
break;
}
+ BLI_assert(GS(image->id.name) == ID_IM);
ImageUser *iuser = &node_cryptomatte->iuser;
BKE_image_user_frame_calc(image, iuser, frame_number);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
