[Bf-blender-cvs] [aaa1608752d] temp-eevee-next-cryptomatte: Remove unused layer_len_
Jeroen Bakker
noreply at git.blender.org
Tue Aug 23 13:57:23 CEST 2022
Commit: aaa1608752dfbd2576a462531c92f0c2fa3c7401
Author: Jeroen Bakker
Date: Tue Aug 23 13:27:37 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rBaaa1608752dfbd2576a462531c92f0c2fa3c7401
Remove unused layer_len_
===================================================================
M source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
M source/blender/draw/engines/eevee_next/eevee_cryptomatte.hh
===================================================================
diff --git a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
index cdaddcbc2bf..3975e0f11e8 100644
--- a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc
@@ -11,12 +11,12 @@ namespace blender::eevee {
void Cryptomatte::init()
{
eViewLayerEEVEEPassType enabled_passes = inst_.film.enabled_passes_get();
- layer_len_ = 0;
- object_offset_ = (enabled_passes & EEVEE_RENDER_PASS_CRYPTOMATTE_OBJECT) ? layer_len_++ : -1;
- asset_offset_ = (enabled_passes & EEVEE_RENDER_PASS_CRYPTOMATTE_ASSET) ? layer_len_++ : -1;
- material_offset_ = (enabled_passes & EEVEE_RENDER_PASS_CRYPTOMATTE_MATERIAL) ? layer_len_++ : -1;
+ int layer_len = 0;
+ object_offset_ = (enabled_passes & EEVEE_RENDER_PASS_CRYPTOMATTE_OBJECT) ? layer_len++ : -1;
+ asset_offset_ = (enabled_passes & EEVEE_RENDER_PASS_CRYPTOMATTE_ASSET) ? layer_len++ : -1;
+ material_offset_ = (enabled_passes & EEVEE_RENDER_PASS_CRYPTOMATTE_MATERIAL) ? layer_len++ : -1;
- BLI_assert_msg(layer_len_ == inst_.film.cryptomatte_layer_len_get(),
+ BLI_assert_msg(layer_len == inst_.film.cryptomatte_layer_len_get(),
"Cryptomatte and film mismatch");
}
diff --git a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.hh b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.hh
index f5568b679e8..7fe257c0840 100644
--- a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.hh
@@ -41,9 +41,6 @@ class Cryptomatte {
int asset_offset_;
int material_offset_;
- /** Number of enabled cryptomatte layers. */
- int layer_len_;
-
CryptomatteObjectBuf cryptomatte_object_buf;
public:
More information about the Bf-blender-cvs
mailing list