[Bf-blender-cvs] [002e75fa24a] temp-attribute-processor: Merge branch 'master' into temp-attribute-processor

[Jacques Lucke]

Commit: 002e75fa24ae610c293354ef750e7f8c541abed8
Author: Jacques Lucke
Date:   Mon May 31 11:13:42 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB002e75fa24ae610c293354ef750e7f8c541abed8

Merge branch 'master' into temp-attribute-processor

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 695420e4ff0,b3247a751bf..78d12c9df8b
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1426,7 -1426,7 +1426,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_MATERIAL_ASSIGN 1049
  #define GEO_NODE_INPUT_MATERIAL 1050
  #define GEO_NODE_MATERIAL_REPLACE 1051
- #define GEO_NODE_ATTRIBUTE_PROCESSOR 1052
+ #define GEO_NODE_MESH_TO_CURVE 1052
++#define GEO_NODE_ATTRIBUTE_PROCESSOR 1053
  
  /** \} */