blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Geometry Nodes: remove empty mesh component in distribute node output

This commit is contained in:
Jacques Lucke 2021-09-28 15:52:04 +02:00
parent 3e78c9e5bb
commit d2004326a1
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_geometry_set.hh
View File

@ -281,6 +281,8 @@ struct GeometrySet {
return this->remove(Component::static_type);
}
void keep_only(const blender::Span<GeometryComponentType> component_types);
void add(const GeometryComponent &component);
blender::Vector<const GeometryComponent *> get_components_for_read() const;

13
source/blender/blenkernel/intern/geometry_set.cc
View File

@ -152,6 +152,19 @@ void GeometrySet::remove(const GeometryComponentType component_type)
components_.remove(component_type);
}
/**
* Remove all geometry components with types that are not in the provided list.
*/
void GeometrySet::keep_only(const blender::Span<GeometryComponentType> component_types)
{
for (auto it = components_.keys().begin(); it != components_.keys().end(); ++it) {
const GeometryComponentType type = *it;
if (!component_types.contains(type)) {
components_.remove(it);
}
}
}
void GeometrySet::add(const GeometryComponent &component)
{
BLI_assert(!components_.contains(component.type()));

5
source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
View File

@ -523,8 +523,6 @@ static void point_distribution_calculate(GeometrySet &geometry_set,
compute_attribute_outputs(
mesh_component, point_component, bary_coords, looptri_indices, attribute_outputs);
geometry_set.replace_mesh(nullptr);
}
static void geo_node_point_distribute_points_on_faces_exec(GeoNodeExecParams params)
@ -551,6 +549,9 @@ static void geo_node_point_distribute_points_on_faces_exec(GeoNodeExecParams par
geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
point_distribution_calculate(
geometry_set, selection_field, method, seed, attribute_outputs, params);
/* Keep instances because the original geometry set may contain instances that are processed as
* well. */
geometry_set.keep_only({GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_INSTANCES});
});
params.set_output("Points", std::move(geometry_set));