Commit: d419b906de94d14a46804951dae4b6a818c77ede Author: Hans Goudey Date: Thu Jan 20 13:56:50 2022 -0600 Branches: temp-geometry-nodes-extrude-mesh https://developer.blender.org/rBd419b906de94d14a46804951dae4b6a818c77ede
Merge branch 'master' into temp-geometry-nodes-extrude-mesh =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index 287657e9a71,1ee8c91ff3e..bf958b0868a --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1629,7 -1629,7 +1629,8 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_ACCUMULATE_FIELD 1146 #define GEO_NODE_INPUT_MESH_EDGE_ANGLE 1147 #define GEO_NODE_FIELD_AT_INDEX 1148 - #define GEO_NODE_EXTRUDE_MESH 1149 + #define GEO_NODE_CURVE_PRIMITIVE_ARC 1149 ++#define GEO_NODE_EXTRUDE_MESH 1150 /** \} */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
