[Bf-blender-cvs] [f9f3ece427d] soc-2021-porting-modifiers-to-nodes-decimate: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

[Fabian Schempp]

Commit: f9f3ece427daa7f8592876bdf96f5cffd759dfec
Author: Fabian Schempp
Date:   Wed Jul 14 19:42:12 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rBf9f3ece427daa7f8592876bdf96f5cffd759dfec

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

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 5092ab6a7a5,b1a38ec5700..35444bc9fa5
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1458,9 -1458,8 +1458,10 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_VIEWER 1067
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
  #define GEO_NODE_CURVE_ENDPOINTS 1069
- #define GEO_NODE_COLLAPSE 1070
- #define GEO_NODE_UNSUBDIVIDE 1071
- #define GEO_NODE_DISSOLVE 1072
+ #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
 -
++#define GEO_NODE_COLLAPSE 1071
++#define GEO_NODE_UNSUBDIVIDE 1072
++#define GEO_NODE_DISSOLVE 1073
  /** \} */
  
  /* -------------------------------------------------------------------- */