griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Use attribute API to convert between mesh and point cloud

Browse Source 
Besides not using CustomData directly which allows future changes,
this should result in proper conversion of vertex groups to generic
point cloud attributes.
This commit is contained in:
Hans Goudey
2025-05-09 22:46:15 -04:00
parent 1e23f9235c
commit d68cd0c1fe
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/intern/mesh_convert.cc
View File

@@ -534,6 +534,8 @@ void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Obj
void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob)
{
using namespace blender;
using namespace blender::bke;
BLI_assert(ob->type == OB_MESH);
const Object *ob_eval = DEG_get_evaluated(depsgraph, ob);
if (!ob_eval) {
@@ -545,11 +547,12 @@ void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/
}
PointCloud *pointcloud = BKE_pointcloud_add(bmain, ob->id.name + 2);
CustomData_free(&pointcloud->pdata);
pointcloud->totpoint = mesh_eval->verts_num;
CustomData_merge(
&mesh_eval->vert_data, &pointcloud->pdata, CD_MASK_PROP_ALL, mesh_eval->verts_num);
copy_attributes(mesh_eval->attributes(),
AttrDomain::Point,
AttrDomain::Point,
{},
pointcloud->attributes_for_write());
BKE_id_materials_copy(bmain, (ID *)ob->data, (ID *)pointcloud);
@@ -562,17 +565,21 @@ void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/
void BKE_pointcloud_to_mesh(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob)
{
using namespace blender;
using namespace blender::bke;
BLI_assert(ob->type == OB_POINTCLOUD);
const Object *ob_eval = DEG_get_evaluated(depsgraph, ob);
const blender::bke::GeometrySet geometry = blender::bke::object_get_evaluated_geometry_set(
*ob_eval);
const GeometrySet geometry = object_get_evaluated_geometry_set(*ob_eval);
Mesh *mesh = BKE_mesh_add(bmain, ob->id.name + 2);
if (const PointCloud *points = geometry.get_pointcloud()) {
mesh->verts_num = points->totpoint;
CustomData_merge(&points->pdata, &mesh->vert_data, CD_MASK_PROP_ALL, points->totpoint);
copy_attributes(points->attributes(),
AttrDomain::Point,
AttrDomain::Point,
{},
mesh->attributes_for_write());
}
BKE_id_materials_copy(bmain, (ID *)ob->data, (ID *)mesh);