Commit: 3064492272f87f2c3be674306dab6adee66f2d34 Author: Jacques Lucke Date: Wed Aug 4 12:34:52 2021 +0200 Branches: temp-geometry-nodes-expandable-geometry-socket-prototype https://developer.blender.org/rB3064492272f87f2c3be674306dab6adee66f2d34
Merge branch 'master' into temp-geometry-nodes-expandable-geometry-socket-prototype =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index d34b3ca26d5,084ec20c172..0f50a7bc1f6 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1484,7 -1475,7 +1484,8 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 #define GEO_NODE_CURVE_TRIM 1071 #define GEO_NODE_CURVE_SET_HANDLES 1072 - #define GEO_NODE_GEOMETRY_EXPANDER 1073 + #define GEO_NODE_CURVE_SPLINE_TYPE 1073 ++#define GEO_NODE_GEOMETRY_EXPANDER 1074 /** \} */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
