[Bf-blender-cvs] [3033b2a0442] master: Fix T73372: cryptomatte not filling last pass for odd number of levels

[Brecht Van Lommel]

Commit: 3033b2a0442fad0af9a2f57054397fec4efba97b
Author: Brecht Van Lommel
Date:   Sat Mar 21 01:37:00 2020 +0100
Branches: master
https://developer.blender.org/rB3033b2a0442fad0af9a2f57054397fec4efba97b

Fix T73372: cryptomatte not filling last pass for odd number of levels

Make logic consistent with the render pass creation in Python.

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

M	intern/cycles/blender/blender_sync.cpp

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 91d715af7e2..28a737c3341 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -633,12 +633,12 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay,
 
   /* Cryptomatte stores two ID/weight pairs per RGBA layer.
    * User facing parameter is the number of pairs. */
-  int crypto_depth = min(16, get_int(crp, "pass_crypto_depth")) / 2;
+  int crypto_depth = min(16, get_int(crp, "pass_crypto_depth"));
   scene->film->cryptomatte_depth = crypto_depth;
   scene->film->cryptomatte_passes = CRYPT_NONE;
   if (get_boolean(crp, "use_pass_crypto_object")) {
-    for (int i = 0; i < crypto_depth; ++i) {
-      string passname = cryptomatte_prefix + string_printf("Object%02d", i);
+    for (int i = 0; i < crypto_depth; i += 2) {
+      string passname = cryptomatte_prefix + string_printf("Object%02d", i / 2);
       b_engine.add_pass(passname.c_str(), 4, "RGBA", b_view_layer.name().c_str());
       Pass::add(PASS_CRYPTOMATTE, passes, passname.c_str());
     }
@@ -646,8 +646,8 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay,
                                                         CRYPT_OBJECT);
   }
   if (get_boolean(crp, "use_pass_crypto_material")) {
-    for (int i = 0; i < crypto_depth; ++i) {
-      string passname = cryptomatte_prefix + string_printf("Material%02d", i);
+    for (int i = 0; i < crypto_depth; i += 2) {
+      string passname = cryptomatte_prefix + string_printf("Material%02d", i / 2);
       b_engine.add_pass(passname.c_str(), 4, "RGBA", b_view_layer.name().c_str());
       Pass::add(PASS_CRYPTOMATTE, passes, passname.c_str());
     }
@@ -655,8 +655,8 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay,
                                                         CRYPT_MATERIAL);
   }
   if (get_boolean(crp, "use_pass_crypto_asset")) {
-    for (int i = 0; i < crypto_depth; ++i) {
-      string passname = cryptomatte_prefix + string_printf("Asset%02d", i);
+    for (int i = 0; i < crypto_depth; i += 2) {
+      string passname = cryptomatte_prefix + string_printf("Asset%02d", i / 2);
       b_engine.add_pass(passname.c_str(), 4, "RGBA", b_view_layer.name().c_str());
       Pass::add(PASS_CRYPTOMATTE, passes, passname.c_str());
     }