[Bf-blender-cvs] [9258671bc33] temp-geometry-nodes-extrude-mesh: Merge branch 'master' into temp-geometry-nodes-extrude-mesh

[Hans Goudey]

Commit: 9258671bc331c62f84791ac93ded34b6033efb36
Author: Hans Goudey
Date:   Fri Jan 21 13:02:13 2022 -0600
Branches: temp-geometry-nodes-extrude-mesh
https://developer.blender.org/rB9258671bc331c62f84791ac93ded34b6033efb36

Merge branch 'master' into temp-geometry-nodes-extrude-mesh

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index bb7d647e713,3b952204755..2f9034f6438
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1631,7 -1631,7 +1631,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_FIELD_AT_INDEX 1148
  #define GEO_NODE_CURVE_PRIMITIVE_ARC 1149
  #define GEO_NODE_FLIP_FACES 1150
- #define GEO_NODE_EXTRUDE_MESH 1151
+ #define GEO_NODE_SCALE_ELEMENTS 1151
++#define GEO_NODE_EXTRUDE_MESH 1152
  
  /** \} */