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

[Hans Goudey]

Commit: bbf78af3c51ad349e8f1c0b8d237d39abbc0de7b
Author: Hans Goudey
Date:   Wed Jun 2 10:11:28 2021 -0400
Branches: temp-attribute-processor
https://developer.blender.org/rBbbf78af3c51ad349e8f1c0b8d237d39abbc0de7b

Merge branch 'master' into temp-attribute-processor

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 90854c6d2cf,00111910d66..e8f23a456bd
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1427,7 -1430,7 +1430,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_INPUT_MATERIAL 1050
  #define GEO_NODE_MATERIAL_REPLACE 1051
  #define GEO_NODE_MESH_TO_CURVE 1052
- #define GEO_NODE_ATTRIBUTE_PROCESSOR 1053
+ #define GEO_NODE_DELETE_GEOMETRY 1053
++#define GEO_NODE_ATTRIBUTE_PROCESSOR 1054
  
  /** \} */