Commit: 1172c0ae4463ee3e1926d7d8d8037294e37f649b Author: Jacques Lucke Date: Tue Jun 15 15:22:10 2021 +0200 Branches: temp-attribute-processor https://developer.blender.org/rB1172c0ae4463ee3e1926d7d8d8037294e37f649b
Merge branch 'master' into temp-attribute-processor =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index 784760ac03e,dbb0786af9d..a67e7f43b6a --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1434,7 -1434,8 +1434,9 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_CURVE_LENGTH 1054 #define GEO_NODE_SELECT_BY_MATERIAL 1055 #define GEO_NODE_CONVEX_HULL 1056 - #define GEO_NODE_ATTRIBUTE_PROCESSOR 1057 + #define GEO_NODE_CURVE_TO_POINTS 1057 + #define GEO_NODE_CURVE_REVERSE 1058 ++#define GEO_NODE_ATTRIBUTE_PROCESSOR 1059 /** \} */ diff --cc source/blender/nodes/CMakeLists.txt index db50e137bdf,9d7c50c99cd..6c4fd527555 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@@ -170,9 -163,11 +170,11 @@@ set(SR geometry/nodes/node_geo_collection_info.cc geometry/nodes/node_geo_common.cc geometry/nodes/node_geo_convex_hull.cc - geometry/nodes/node_geo_curve_length.cc + geometry/nodes/node_geo_curve_length.cc geometry/nodes/node_geo_curve_to_mesh.cc + geometry/nodes/node_geo_curve_to_points.cc geometry/nodes/node_geo_curve_resample.cc + geometry/nodes/node_geo_curve_reverse.cc geometry/nodes/node_geo_delete_geometry.cc geometry/nodes/node_geo_edge_split.cc geometry/nodes/node_geo_input_material.cc diff --cc source/blender/nodes/NOD_derived_node_tree.hh index 4488d5ea5a6,de9e4c8c812..2dda36b40ad --- a/source/blender/nodes/NOD_derived_node_tree.hh +++ b/source/blender/nodes/NOD_derived_node_tree.hh @@@ -173,8 -176,8 +176,9 @@@ class DerivedNodeTree Span<const NodeTreeRef *> used_node_tree_refs() const; bool has_link_cycles() const; + bool has_undefined_nodes_or_sockets() const; void foreach_node(FunctionRef<void(DNode)> callback) const; + void foreach_node_with_type(StringRef idname, FunctionRef<void(DNode)> callback) const; std::string to_dot() const; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs