diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-08 01:11:21 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-08 01:11:21 +0300 |
commit | 770793e545a42cff0ccc5d67a9f79a3a845e650f (patch) | |
tree | f080ab0dcb149d73ad4704571749a0873de7229b /source/blender | |
parent | 674e4640f6a383a71de8bf20049409ab688cee57 (diff) | |
parent | 229d0ace026ffb3591fdad4c5a6e0530c1243025 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc index 3c790079b5b..89227c773cc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc @@ -60,7 +60,7 @@ static std::optional<Mesh *> mesh_merge_by_distance(const MeshComponent &mesh_co const IndexMask selection = evaluator.get_evaluated_as_mask(0); if (selection.is_empty()) { - return nullptr; + return std::nullopt; } const Mesh &mesh = *mesh_component.get_for_read(); @@ -78,7 +78,9 @@ static void node_geo_exec(GeoNodeExecParams params) if (geometry_set.has_pointcloud()) { PointCloud *result = pointcloud_merge_by_distance( *geometry_set.get_component_for_read<PointCloudComponent>(), merge_distance, selection); - geometry_set.replace_pointcloud(result); + if (result) { + geometry_set.replace_pointcloud(result); + } } if (geometry_set.has_mesh()) { std::optional<Mesh *> result = mesh_merge_by_distance( |