Correct naming of cryptomatte output sockets on the render layers node
authorRobert Guetzkow <rjg>
Mon, 4 Nov 2019 13:53:09 +0000 (14:53 +0100)
committerLukas Stockner <lukas.stockner@freenet.de>
Mon, 4 Nov 2019 13:53:09 +0000 (14:53 +0100)
The cryptomatte sockets were incorrectly numbered using a step size of two. While the increment by two is necessary to get the correct number of render passes, they should be numbered consecutively matching the socket names of the cryptomatte node.

Reviewed By: lukasstockner97

Differential Revision: https://developer.blender.org/D6185

intern/cycles/blender/addon/engine.py
release/scripts/addons
release/scripts/addons_contrib

index 61ac24f7f07ff9b6e06a07e6f1f2d07d951e088a..013d86a560b89db72bec64bf4ce8ce746c1e02cb 100644 (file)
@@ -262,13 +262,13 @@ def register_passes(engine, scene, srl):
 
     if crl.use_pass_crypto_object:
         for i in range(0, crl.pass_crypto_depth, 2):
-            engine.register_pass(scene, srl, "CryptoObject" + '{:02d}'.format(i), 4, "RGBA", 'COLOR')
+            engine.register_pass(scene, srl, "CryptoObject" + '{:02d}'.format(i//2), 4, "RGBA", 'COLOR')
     if crl.use_pass_crypto_material:
         for i in range(0, crl.pass_crypto_depth, 2):
-            engine.register_pass(scene, srl, "CryptoMaterial" + '{:02d}'.format(i), 4, "RGBA", 'COLOR')
+            engine.register_pass(scene, srl, "CryptoMaterial" + '{:02d}'.format(i//2), 4, "RGBA", 'COLOR')
     if srl.cycles.use_pass_crypto_asset:
         for i in range(0, srl.cycles.pass_crypto_depth, 2):
-            engine.register_pass(scene, srl, "CryptoAsset" + '{:02d}'.format(i), 4, "RGBA", 'COLOR')
+            engine.register_pass(scene, srl, "CryptoAsset" + '{:02d}'.format(i//2), 4, "RGBA", 'COLOR')
 
     if crl.use_denoising or crl.denoising_store_passes:
         engine.register_pass(scene, srl, "Noisy Image", 4, "RGBA", 'COLOR')
index 854b986732d643e696973175e480c15594bc4780..67f1fbca1482d9d9362a4001332e785c3fd5d230 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 854b986732d643e696973175e480c15594bc4780
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
index 786f4704328507a95b6c1d254bf4cf400a5e8f0c..ef6ef414d22c2578fad99327743b925ab640a99c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 786f4704328507a95b6c1d254bf4cf400a5e8f0c
+Subproject commit ef6ef414d22c2578fad99327743b925ab640a99c