forked from bartvdbraak/blender
Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
770793e545
@ -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(
|
||||
|
@ -1111,9 +1111,9 @@ elseif(APPLE)
|
||||
${TARGETDIR_VER}/python/lib
|
||||
)
|
||||
|
||||
install(DIRECTORY ${LIBDIR}/python/bin
|
||||
DESTINATION ${TARGETDIR_VER}/python
|
||||
USE_SOURCE_PERMISSIONS
|
||||
install(
|
||||
PROGRAMS ${PYTHON_EXECUTABLE}
|
||||
DESTINATION ${TARGETDIR_VER}/python/bin
|
||||
)
|
||||
|
||||
# Needed for distutils/pip
|
||||
|
Loading…
Reference in New Issue
Block a user