[Bf-blender-cvs] [aaee6e13d45] soc-2021-porting-modifiers-to-nodes-remesh-blocks: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

[Fabian Schempp]

Commit: aaee6e13d4508f337bcc3808c3c158a468930791
Author: Fabian Schempp
Date:   Fri Jul 23 21:08:25 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rBaaee6e13d4508f337bcc3808c3c158a468930791

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

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index cf00056ce0d,cecb3118038..5ac132321d9
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1464,7 -1464,8 +1464,9 @@@ 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_BLOCKS 1071
+ #define GEO_NODE_CURVE_TRIM 1071
+ #define GEO_NODE_CURVE_SET_HANDLES 1072
++#define GEO_NODE_REMESH_BLOCKS 1073
  
  /** \} */