[Bf-blender-cvs] [048a5e5f568] ui-asset-view-template: Merge branch 'master' into ui-asset-view-template

[Julian Eisel]

Commit: 048a5e5f5683d1ee50cb554e6e88abfe34f120b8
Author: Julian Eisel
Date:   Thu Mar 11 14:58:27 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rB048a5e5f5683d1ee50cb554e6e88abfe34f120b8

Merge branch 'master' into ui-asset-view-template

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



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

diff --cc source/blender/blenkernel/intern/cryptomatte_test.cc
index 5481b97913c,7a86002cf6a..d43bb5d1dd2
--- a/source/blender/blenkernel/intern/cryptomatte_test.cc
+++ b/source/blender/blenkernel/intern/cryptomatte_test.cc
@@@ -175,18 -171,6 +173,17 @@@ TEST(cryptomatte, session_from_stamp_da
        nullptr, render_result2->stamp_data, validate_cryptomatte_session_from_stamp_data, false);
  
    RE_FreeRenderResult(render_result2);
-   BKE_cryptomatte_free(session);
  }
  
 +TEST(cryptomatte, T86026)
 +{
 +  NodeCryptomatte storage = {{0.0f}};
 +  CryptomatteEntry entry = {nullptr};
 +  BLI_addtail(&storage.entries, &entry);
 +  entry.encoded_hash = 4.76190593e-07;
 +  char *matte_id = BKE_cryptomatte_entries_to_matte_id(&storage);
 +  EXPECT_STREQ("<4.761905927e-07>", matte_id);
 +  MEM_freeN(matte_id);
 +}
 +
  }  // namespace blender::bke::cryptomatte::tests