[Bf-blender-cvs] [0827cce9de4] temp-geometry-nodes-fields-prototype: Merge remote-tracking branch 'origin/temp-geometry-nodes-fields-prototype' into temp-geometry-nodes-fields-prototype

[Fabian Schempp]

Commit: 0827cce9de4cfde7c8c03acfe685e88bcae6a79e
Author: Fabian Schempp
Date:   Tue Aug 10 09:34:04 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB0827cce9de4cfde7c8c03acfe685e88bcae6a79e

Merge remote-tracking branch 'origin/temp-geometry-nodes-fields-prototype' into temp-geometry-nodes-fields-prototype

# Conflicts:
#	source/blender/blenkernel/BKE_node.h

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index c7bb8e3ed47,8604698b69a..3cbc80d49a3
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1481,7 -1481,9 +1481,10 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_INDEX 1076
  #define GEO_NODE_EXTRUDE 1077
  #define GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS 1078
+ #define GEO_NODE_ATTRIBUTE_EXTRACT 1079
+ #define GEO_NODE_NORMAL 1080
+ #define GEO_NODE_CURVE_PARAMETER 1081
 +#define GEO_NODE_EXTRUDE_AND_MOVE 1079
  
  /** \} */