[Bf-blender-cvs] [991f6b15f39] soc-2021-porting-modifiers-to-nodes-extrude: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-extrude

[Fabian Schempp]

Commit: 991f6b15f39afe292d5f77ab191b29d8fcdae636
Author: Fabian Schempp
Date:   Thu Aug 5 23:50:08 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-extrude
https://developer.blender.org/rB991f6b15f39afe292d5f77ab191b29d8fcdae636

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-extrude

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 73921f3e61d,084ec20c172..bfa3c58cbe2
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1475,7 -1475,7 +1475,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_EXTRUDE 1073
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
++#define GEO_NODE_EXTRUDE 1074
  
  /** \} */