Commit: f204b3d16c0e8128623069e3a4163c6c9b1baa85 Author: Jacques Lucke Date: Fri Aug 6 10:21:02 2021 +0200 Branches: temp-geometry-nodes-expandable-geometry-socket-prototype https://developer.blender.org/rBf204b3d16c0e8128623069e3a4163c6c9b1baa85
Merge branch 'master' into temp-geometry-nodes-expandable-geometry-socket-prototype =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index 4c4231877bf,caa7ab6de0a..ec438b0c9c0 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1488,7 -1476,7 +1488,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_GEOMETRY_EXPANDER 1074 + #define GEO_NODE_CURVE_SELECT_HANDLES 1074 ++#define GEO_NODE_GEOMETRY_EXPANDER 1075 /** \} */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
