[Bf-blender-cvs] [6d2cc371b5b] soc-2021-porting-modifiers-to-nodes-remesh-voxel: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel

[Fabian Schempp]

Commit: 6d2cc371b5b3b36f635c47085ab2b7890ff3c76a
Author: Fabian Schempp
Date:   Sat Jul 31 00:15:29 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-voxel
https://developer.blender.org/rB6d2cc371b5b3b36f635c47085ab2b7890ff3c76a

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

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 435fb5971d4,cecb3118038..62edbe6e336
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1464,7 -1464,9 +1464,10 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
  #define GEO_NODE_CURVE_ENDPOINTS 1069
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
- #define GEO_NODE_REMESH_VOXEL 1071
+ #define GEO_NODE_CURVE_TRIM 1071
+ #define GEO_NODE_CURVE_SET_HANDLES 1072
++#define GEO_NODE_REMESH_VOXEL 1073
+ 
  /** \} */
  
  /* -------------------------------------------------------------------- */