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>2022-09-12 15:59:35 +0300
committerJeroen Bakker <jeroen@blender.org>2022-09-12 15:59:35 +0300
commitae5fb670e99787f9ece28a66f1475e607376b904 (patch)
treea494654b9f4043065d99edcf91ad3c238aee1632
parent80eff102f99f49be5cc5e50f7181fb02d76a40cd (diff)
Fixes issue with selecting incorrect meta-data.
-rw-r--r--source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc2
-rw-r--r--source/blender/draw/engines/eevee_next/eevee_film.cc1
2 files changed, 2 insertions, 1 deletions
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) {