[Bf-blender-cvs] [ca91b7f5263] soc-2021-curve-fillet: Merge branch 'master' into soc-2021-curve-fillet

[dilithjay]

Commit: ca91b7f526329a18230df491132106b5d31051f6
Author: dilithjay
Date:   Sat Sep 4 13:56:16 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rBca91b7f526329a18230df491132106b5d31051f6

Merge branch 'master' into soc-2021-curve-fillet

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 278fda12e69,5e0526ab262..5e00e7608fd
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1472,7 -1482,7 +1482,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_SET_HANDLES 1072
  #define GEO_NODE_CURVE_SPLINE_TYPE 1073
  #define GEO_NODE_CURVE_SELECT_HANDLES 1074
- #define GEO_NODE_CURVE_FILLET 1075
+ #define GEO_NODE_CURVE_FILL 1075
++#define GEO_NODE_CURVE_FILLET 1076
  
  /** \} */