[Bf-blender-cvs] [4aae9881636] temp-geometry-nodes-curve-deform-node: Merge branch 'master' into temp-geometry-nodes-curve-deform-node

[Hans Goudey]

Commit: 4aae9881636b44942912d26b5ab2d19c4a7b329f
Author: Hans Goudey
Date:   Tue Jun 8 11:48:18 2021 -0500
Branches: temp-geometry-nodes-curve-deform-node
https://developer.blender.org/rB4aae9881636b44942912d26b5ab2d19c4a7b329f

Merge branch 'master' into temp-geometry-nodes-curve-deform-node

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 89d9ebdc5b3,16da621a0fa..48c3d9b2d97
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1432,7 -1432,7 +1432,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_MESH_TO_CURVE 1052
  #define GEO_NODE_DELETE_GEOMETRY 1053
  #define GEO_NODE_CURVE_LENGTH 1054
- #define GEO_NODE_CURVE_DEFORM 1055
+ #define GEO_NODE_SELECT_BY_MATERIAL 1055
++#define GEO_NODE_CURVE_DEFORM 1056
  
  /** \} */