Commit: da51945effe434b650d2f4e3c0f5ff550718a8b8
Author: Sergey Sharybin
Date: Thu Sep 1 13:05:28 2022 +0200
Branches: temp-crypto_naming
https://developer.blender.org/rBda51945effe434b650d2f4e3c0f5ff550718a8b8
Experiment with different channel names for cryptomatte passes
===================================================================
M intern/cycles/blender/sync.cpp
M source/blender/draw/engines/eevee/eevee_cryptomatte.c
===================================================================
diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp
index 9bd0abe2773..ac56f8240a7 100644
--- a/intern/cycles/blender/sync.cpp
+++ b/intern/cycles/blender/sync.cpp
@@ -691,7 +691,7 @@ void BlenderSync::sync_render_passes(BL::RenderLayer
&b_rlay, BL::ViewLayer &b_v
if (b_view_layer.use_pass_cryptomatte_object()) {
for (int i = 0; i < crypto_depth; i++) {
string passname = cryptomatte_prefix + string_printf("Object%02d", i);
- b_engine.add_pass(passname.c_str(), 4, "xyzw",
b_view_layer.name().c_str());
+ b_engine.add_pass(passname.c_str(), 4, "rgba",
b_view_layer.name().c_str());
pass_add(scene, PASS_CRYPTOMATTE, passname.c_str());
}
cryptomatte_passes = (CryptomatteType)(cryptomatte_passes | CRYPT_OBJECT);
@@ -699,7 +699,7 @@ void BlenderSync::sync_render_passes(BL::RenderLayer
&b_rlay, BL::ViewLayer &b_v
if (b_view_layer.use_pass_cryptomatte_material()) {
for (int i = 0; i < crypto_depth; i++) {
string passname = cryptomatte_prefix + string_printf("Material%02d", i);
- b_engine.add_pass(passname.c_str(), 4, "xyzw",
b_view_layer.name().c_str());
+ b_engine.add_pass(passname.c_str(), 4, "rgba",
b_view_layer.name().c_str());
pass_add(scene, PASS_CRYPTOMATTE, passname.c_str());
}
cryptomatte_passes = (CryptomatteType)(cryptomatte_passes |
CRYPT_MATERIAL);
@@ -707,7 +707,7 @@ void BlenderSync::sync_render_passes(BL::RenderLayer
&b_rlay, BL::ViewLayer &b_v
if (b_view_layer.use_pass_cryptomatte_asset()) {
for (int i = 0; i < crypto_depth; i++) {
string passname = cryptomatte_prefix + string_printf("Asset%02d", i);
- b_engine.add_pass(passname.c_str(), 4, "xyzw",
b_view_layer.name().c_str());
+ b_engine.add_pass(passname.c_str(), 4, "rgba",
b_view_layer.name().c_str());
pass_add(scene, PASS_CRYPTOMATTE, passname.c_str());
}
cryptomatte_passes = (CryptomatteType)(cryptomatte_passes | CRYPT_ASSET);
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index 36ec1354375..60297353daf 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -431,21 +431,21 @@ void EEVEE_cryptomatte_update_passes(RenderEngine
*engine, Scene *scene, ViewLay
for (short pass = 0; pass < num_passes; pass++) {
BLI_snprintf_rlen(cryptomatte_pass_name, MAX_NAME, "CryptoObject%02d",
pass);
RE_engine_register_pass(
- engine, scene, view_layer, cryptomatte_pass_name, 4, "xyzw",
SOCK_RGBA);
+ engine, scene, view_layer, cryptomatte_pass_name, 4, "rgba",
SOCK_RGBA);
}
}
if ((view_layer->cryptomatte_flag & VIEW_LAYER_CRYPTOMATTE_MATERIAL) != 0) {
for (short pass = 0; pass < num_passes; pass++) {
BLI_snprintf_rlen(cryptomatte_pass_name, MAX_NAME, "CryptoMaterial%02d",
pass);
RE_engine_register_pass(
- engine, scene, view_layer, cryptomatte_pass_name, 4, "xyzw",
SOCK_RGBA);
+ engine, scene, view_layer, cryptomatte_pass_name, 4, "rgba",
SOCK_RGBA);
}
}
if ((view_layer->cryptomatte_flag & VIEW_LAYER_CRYPTOMATTE_ASSET) != 0) {
for (short pass = 0; pass < num_passes; pass++) {
BLI_snprintf_rlen(cryptomatte_pass_name, MAX_NAME, "CryptoAsset%02d",
pass);
RE_engine_register_pass(
- engine, scene, view_layer, cryptomatte_pass_name, 4, "xyzw",
SOCK_RGBA);
+ engine, scene, view_layer, cryptomatte_pass_name, 4, "rgba",
SOCK_RGBA);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
