Commit: 7cacec80e5a9b84e870a1b57ff65afab573aa7fe Author: Fabian Schempp Date: Sat Jul 3 00:07:14 2021 +0200 Branches: soc-2021-porting-modifiers-to-nodes-decimate https://developer.blender.org/rB7cacec80e5a9b84e870a1b57ff65afab573aa7fe
merged with master and cleanup =================================================================== M source/blender/blenkernel/intern/node.cc M source/blender/nodes/NOD_static_types.h =================================================================== diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 28f3bc37615..ed8049e602e 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -5065,7 +5065,6 @@ static void registerGeometryNodes() register_node_type_geo_curve_resample(); register_node_type_geo_curve_reverse(); register_node_type_geo_curve_subdivide(); - register_node_type_geo_decimate(); register_node_type_geo_dissolve(); register_node_type_geo_delete_geometry(); register_node_type_geo_edge_split(); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index abe3ebc1f48..d1e0974a766 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -335,7 +335,7 @@ DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, 0, "SUBDIVISION_SURFACE", Su DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "") DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "") DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "") -DefNode(GeometryNode, GEO_NODE_UNSUBDimIVIDE, 0, "UNSUBDIVIDE", Unsubdivide, "Unsubdivide", "") +DefNode(GeometryNode, GEO_NODE_UNSUBDIVIDE, 0, "UNSUBDIVIDE", Unsubdivide, "Unsubdivide", "") DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "") /* undefine macros */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
