[Bf-blender-cvs] [fad55ce70be] soc-2021-porting-modifiers-to-nodes-extrude-and-move: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-extrude-and-move

[Fabian Schempp]

Commit: fad55ce70bed63b4fee7944bc04ddf0998230b77
Author: Fabian Schempp
Date:   Sun Aug 15 09:13:45 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-extrude-and-move
https://developer.blender.org/rBfad55ce70bed63b4fee7944bc04ddf0998230b77

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

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index c9f5777109a,caa7ab6de0a..3b8ab619510
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1476,7 -1476,7 +1476,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
  #define GEO_NODE_CURVE_SPLINE_TYPE 1073
- #define GEO_NODE_MESH_INSET 1074
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_MESH_INSET 1075
  
  /** \} */