[Bf-blender-cvs] [c855772afdc] temp-compositor-cryptomatte-picker: Merge branch 'master' into temp-compositor-cryptomatte-picker

[Jeroen Bakker]

Commit: c855772afdc7c18cec69fca3e28ff7793ca1b42a
Author: Jeroen Bakker
Date:   Tue Mar 16 08:23:56 2021 +0100
Branches: temp-compositor-cryptomatte-picker
https://developer.blender.org/rBc855772afdc7c18cec69fca3e28ff7793ca1b42a

Merge branch 'master' into temp-compositor-cryptomatte-picker

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 8e353426061,42022cce5a5..6c004cb0806
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1288,11 -1288,11 +1288,12 @@@ void ntreeCompositCryptomatteSyncFromAd
  void ntreeCompositCryptomatteSyncFromRemove(bNode *node);
  bNodeSocket *ntreeCompositCryptomatteAddSocket(bNodeTree *ntree, bNode *node);
  int ntreeCompositCryptomatteRemoveSocket(bNodeTree *ntree, bNode *node);
- const char *ntreeCompositCryptomatteLayerPrefix(const bNode *node);
+ void ntreeCompositCryptomatteLayerPrefix(const bNode *node, char *r_prefix, size_t prefix_len);
 -
  /* Update the runtime layer names with the cryptomatte layer names of the references
   * render layer or image. */
  void ntreeCompositCryptomatteUpdateLayerNames(bNode *node);
 +struct CryptomatteSession *ntreeCompositCryptomatteSession(bNode *node);
++
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/editors/interface/interface_eyedropper_color.c
index 53cdc54a9cb,349086132dc..a8947266aad
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_color.c
@@@ -59,10 -58,9 +59,12 @@@
  #include "ED_clip.h"
  #include "ED_image.h"
  #include "ED_node.h"
 +#include "ED_screen.h"
 +
 +#include "RE_pipeline.h"
  
+ #include "RE_pipeline.h"
+ 
  #include "interface_eyedropper_intern.h"
  
  typedef struct Eyedropper {
diff --cc source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index 3be7325b564,d81076c2fa6..b6e100a26b3
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@@ -206,24 -206,16 +206,21 @@@ void ntreeCompositCryptomatteLayerPrefi
        }
  
        if (layer_name == node_cryptomatte->layer_name) {
-         return node_cryptomatte->layer_name;
+         BLI_strncpy(r_prefix, node_cryptomatte->layer_name, prefix_len);
 -        return;
        }
      }
    }
--
-   if (!first_layer_name.has_value()) {
-     return "";
-   }
-   return first_layer_name.value().c_str();
+   const char *cstr = first_layer_name.c_str();
+   BLI_strncpy(r_prefix, cstr, prefix_len);
  }
  
 +CryptomatteSession *ntreeCompositCryptomatteSession(bNode *node)
 +{
 +  blender::bke::cryptomatte::CryptomatteSessionPtr session_ptr = cryptomatte_init_from_node(
 +      *node, 0, true);
 +  return session_ptr.release();
 +}
 +
  static void node_init_cryptomatte(bNodeTree *UNUSED(ntree), bNode *node)
  {
    NodeCryptomatte *user = static_cast<NodeCryptomatte *>(