[Bf-blender-cvs] [c45b4499799] temp-compositor-single-threaded-operation: Fix: Cryptomatte Picker on Legacy Node Failing.

[Jeroen Bakker]

Commit: c45b449979974bb21df76305ead02442c01a9c97
Author: Jeroen Bakker
Date:   Wed Mar 31 14:20:23 2021 +0200
Branches: temp-compositor-single-threaded-operation
https://developer.blender.org/rBc45b449979974bb21df76305ead02442c01a9c97

Fix: Cryptomatte Picker on Legacy Node Failing.

The new Cryptomatte workflow assumes that the picker is used in the new
workflow. The legacy node wasn't working as it would never find a
correct cryptomatte layer. This fix will use the color sampling like we
used to do.

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

M	source/blender/editors/interface/interface_eyedropper_color.c

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

diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c
index 4ae6f66281f..d5fb0e4e744 100644
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_color.c
@@ -116,14 +116,11 @@ static bool eyedropper_init(bContext *C, wmOperator *op)
 
   float col[4];
   RNA_property_float_get_array(&eye->ptr, eye->prop, col);
-  if (ELEM(eye->ptr.type, &RNA_CompositorNodeCryptomatteV2, &RNA_CompositorNodeCryptomatte)) {
+  if (eye->ptr.type == &RNA_CompositorNodeCryptomatteV2) {
     eye->crypto_node = (bNode *)eye->ptr.data;
     eye->cryptomatte_session = ntreeCompositCryptomatteSession(eye->crypto_node);
     eye->draw_handle_sample_text = WM_draw_cb_activate(CTX_wm_window(C), eyedropper_draw_cb, eye);
   }
-  else {
-    eye->crypto_node = NULL;
-  }
 
   if (prop_subtype != PROP_COLOR) {
     Scene *scene = CTX_data_scene(C);