Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-03-16 12:08:24 +0300
committerJeroen Bakker <jeroen@blender.org>2021-03-16 12:12:03 +0300
commitcb3005c2633dc3bea328b67a075709a8a1824fdd (patch)
treec400ad74f52d477542a5b3c552455862d31c0b0b /source/blender/nodes/composite
parent0a34fec56a2f8d051a1348d4e82049e063ffcc37 (diff)
Fix: read cryptomatte manifests when images aren't loaded yet.
A check was preventing the actual image to load and was therefore not parsed.
Diffstat (limited to 'source/blender/nodes/composite')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc4
1 files changed, 2 insertions, 2 deletions
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);