[Bf-blender-cvs] [4b7eae5cd3f] temp-attribute-processor: Merge branch 'master' into temp-attribute-processor

[Jacques Lucke]

Commit: 4b7eae5cd3f01fceca7150e9837347d1e5a66ca2
Author: Jacques Lucke
Date:   Wed Jun 16 15:16:04 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB4b7eae5cd3f01fceca7150e9837347d1e5a66ca2

Merge branch 'master' into temp-attribute-processor

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index a67e7f43b6a,5c9d7881093..822bed89e33
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1436,7 -1436,7 +1436,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CONVEX_HULL 1056
  #define GEO_NODE_CURVE_TO_POINTS 1057
  #define GEO_NODE_CURVE_REVERSE 1058
- #define GEO_NODE_ATTRIBUTE_PROCESSOR 1059
+ #define GEO_NODE_SEPARATE_COMPONENTS 1059
++#define GEO_NODE_ATTRIBUTE_PROCESSOR 1060
  
  /** \} */