Commit: 76750c3ee2f279cc457b0189aa7ec35bc4a9b190 Author: dilithjay Date: Sat Jul 17 10:24:48 2021 +0530 Branches: soc-2021-curve-fillet https://developer.blender.org/rB76750c3ee2f279cc457b0189aa7ec35bc4a9b190
Merge branch 'master' into soc-2021-curve-fillet =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index b9f111d5a05,63b11a194ff..312eb20bfe8 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1458,7 -1463,7 +1463,8 @@@ 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_CURVE_FILLET 1070 + #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 ++#define GEO_NODE_CURVE_FILLET 1071 /** \} */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
