[Bf-blender-cvs] [bc12b3f6f66] compositor-cryptomatte-workflow: Merge branch 'master' into compositor-cryptomatte-workflow

[Jeroen Bakker]

Commit: bc12b3f6f66fd6e50cfd4f7e576df33e7a20ff88
Author: Jeroen Bakker
Date:   Tue Mar 2 11:47:32 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rBbc12b3f6f66fd6e50cfd4f7e576df33e7a20ff88

Merge branch 'master' into compositor-cryptomatte-workflow

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



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

diff --cc source/blender/blenkernel/BKE_cryptomatte.h
index a3bb04ecb37,96e853e7ff8..4c95b2eff98
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@@ -42,16 -45,15 +45,19 @@@ void BKE_cryptomatte_add_layer(struct C
  
  uint32_t BKE_cryptomatte_hash(const char *name, int name_len);
  uint32_t BKE_cryptomatte_object_hash(struct CryptomatteSession *session,
+                                      const char *layer_name,
                                       const struct Object *object);
  uint32_t BKE_cryptomatte_material_hash(struct CryptomatteSession *session,
+                                        const char *layer_name,
                                         const struct Material *material);
  uint32_t BKE_cryptomatte_asset_hash(struct CryptomatteSession *session,
+                                     const char *layer_name,
                                      const struct Object *object);
  float BKE_cryptomatte_hash_to_float(uint32_t cryptomatte_hash);
 +bool BKE_cryptomatte_find_name(const struct Main *bmain,
 +                               const float encoded_hash,
 +                               char *r_name,
 +                               int name_len);
  
  char *BKE_cryptomatte_entries_to_matte_id(struct NodeCryptomatte *node_storage);
  void BKE_cryptomatte_matte_id_to_entries(struct NodeCryptomatte *node_storage,