[Bf-blender-cvs] [ae5fb670e99] temp-eevee-next-cryptomatte: Fixes issue with selecting incorrect meta-data.

[Jeroen Bakker]

Commit: ae5fb670e99787f9ece28a66f1475e607376b904
Author: Jeroen Bakker
Date:   Mon Sep 12 14:59:35 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rBae5fb670e99787f9ece28a66f1475e607376b904

Fixes issue with selecting incorrect meta-data.

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

M	source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
M	source/blender/draw/engines/eevee_next/eevee_film.cc

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

diff --git a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
index 00c4a86732e..09ebd367ebc 100644
--- a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
@@ -98,7 +98,7 @@ float Cryptomatte::register_id(const eViewLayerEEVEEPassType layer, const ID &id
       BLI_assert(asset_layer_);
       cryptomatte_hash = asset_layer_->add_ID(id);
     }
-    else if (layer == EEVEE_RENDER_PASS_CRYPTOMATTE_OBJECT) {
+    else if (layer == EEVEE_RENDER_PASS_CRYPTOMATTE_MATERIAL) {
       BLI_assert(material_layer_);
       cryptomatte_hash = material_layer_->add_ID(id);
     }
diff --git a/source/blender/draw/engines/eevee_next/eevee_film.cc b/source/blender/draw/engines/eevee_next/eevee_film.cc
index b4e63ac962b..b89746d99e2 100644
--- a/source/blender/draw/engines/eevee_next/eevee_film.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_film.cc
@@ -454,6 +454,7 @@ void Film::sync()
   accumulate_ps_.bind_image("depth_img", &depth_tx_);
   accumulate_ps_.bind_image("color_accum_img", &color_accum_tx_);
   accumulate_ps_.bind_image("value_accum_img", &value_accum_tx_);
+  accumulate_ps_.bind_image("cryptomatte_img", &cryptomatte_tx_);
   /* Sync with rendering passes. */
   accumulate_ps_.barrier(GPU_BARRIER_TEXTURE_FETCH | GPU_BARRIER_SHADER_IMAGE_ACCESS);
   if (use_compute) {