[Bf-blender-cvs] [407bcdf24b6] temp-geometry-nodes-attribute-search: Merge branch 'master' into temp-geometry-nodes-attribute-search

[Hans Goudey]

Commit: 407bcdf24b65a2d356de07f2d0d7a43c6cda554f
Author: Hans Goudey
Date:   Wed Feb 24 15:01:14 2021 -0600
Branches: temp-geometry-nodes-attribute-search
https://developer.blender.org/rB407bcdf24b65a2d356de07f2d0d7a43c6cda554f

Merge branch 'master' into temp-geometry-nodes-attribute-search

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



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

diff --cc source/blender/editors/space_node/node_intern.h
index 697391dae4d,5973d59e68f..c3218509df4
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@@ -291,6 -289,6 +291,13 @@@ void NODE_GGT_backdrop_corner_pin(struc
  void NODE_OT_cryptomatte_layer_add(struct wmOperatorType *ot);
  void NODE_OT_cryptomatte_layer_remove(struct wmOperatorType *ot);
  
++/* node_geometry_attribute_search.cc */
++void node_socket_button_add_attribute_search(const struct bContext *C,
++                                             struct bNode *node,
++                                             struct bNodeSocket *socket,
++                                             struct uiBlock *block,
++                                             struct uiBut *but);
++
  extern const char *node_context_dir[];
  
  /* XXXXXX */