diff options
author | Hans Goudey <h.goudey@me.com> | 2021-12-13 08:00:39 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-12-13 08:00:39 +0300 |
commit | 80f1527762c1cac50c04074282088aa12797ec0a (patch) | |
tree | 43b962610a80b04974683074f7ec045dbfe4ca84 | |
parent | d9d4b9899e8b78af6324d4f76b8e69f555bbc49d (diff) |
Cleanup: Point cloud vs point-cloud in comments
Point cloud is two separate words, this just changes comments in
a few places where we were inconsistent. A small wording change
to another comment is also included.
7 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index 7d33cb81f0f..79f29e0954e 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/source/blender/blenkernel/BKE_geometry_set.hh @@ -264,8 +264,8 @@ inline constexpr bool is_geometry_component_v = std::is_base_of_v<GeometryCompon * individual components might be shared between multiple geometries and other code. Shared * components are copied automatically when write access is requested. * - * The components usually do not store data by them self, but keep a reference to a data structure - * defined elsewhere in Blender. There is at most one component of each type: + * The components usually do not store data directly, but keep a reference to a data + * structure defined elsewhere. There is at most one component of each type: * - #MeshComponent * - #CurveComponent * - #PointCloudComponent @@ -559,7 +559,7 @@ class MeshComponent : public GeometryComponent { * A geometry component that stores a point cloud, corresponding to the #PointCloud data structure. * While a point cloud is technically a subset of a mesh in some respects, it is useful because of * its simplicity, partly on a conceptual level for the user, but also in the code, though partly - * for historical reasons. Point-clouds can also be rendered in special ways, based on the built-in + * for historical reasons. Point clouds can also be rendered in special ways, based on the built-in * `radius` attribute. * * Attributes on point clouds are all stored in contiguous arrays in its #CustomData, diff --git a/source/blender/blenkernel/BKE_pointcloud.h b/source/blender/blenkernel/BKE_pointcloud.h index d2d390dc786..af8a6ed293d 100644 --- a/source/blender/blenkernel/BKE_pointcloud.h +++ b/source/blender/blenkernel/BKE_pointcloud.h @@ -18,7 +18,7 @@ /** \file * \ingroup bke - * \brief General operations for point-clouds. + * \brief General operations for point clouds. */ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc index 253c4642c14..6d50dcd3c8c 100644 --- a/source/blender/blenkernel/intern/geometry_set_instances.cc +++ b/source/blender/blenkernel/intern/geometry_set_instances.cc @@ -74,7 +74,7 @@ GeometrySet object_get_evaluated_geometry_set(const Object &object) add_final_mesh_as_geometry_component(object, geometry_set); } - /* TODO: Cover the case of point-clouds without modifiers-- they may not be covered by the + /* TODO: Cover the case of point clouds without modifiers-- they may not be covered by the * #geometry_set_eval case above. */ /* TODO: Add volume support. */ diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 2afadda9ade..9354171a1e4 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -3101,11 +3101,11 @@ static int object_convert_exec(bContext *C, wmOperator *op) basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL); newob = basen->object; - /* Decrement original point-cloud's usage count. */ + /* Decrement original point cloud's usage count. */ PointCloud *pointcloud = newob->data; id_us_min(&pointcloud->id); - /* Make a new copy of the point-cloud. */ + /* Make a new copy of the point cloud. */ newob->data = BKE_id_copy(bmain, &pointcloud->id); } else { diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index fde7e34cdb5..b07e9ffc882 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -714,7 +714,7 @@ static bool modifier_apply_shape(Main *bmain, BKE_id_free(NULL, mesh_applied); } else { - /* TODO: implement for hair, point-clouds and volumes. */ + /* TODO: implement for hair, point clouds and volumes. */ BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type"); return false; } @@ -813,7 +813,7 @@ static bool modifier_apply_obdata( DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } else { - /* TODO: implement for hair, point-clouds and volumes. */ + /* TODO: implement for hair, point clouds and volumes. */ BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type"); return false; } diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_transfer.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_transfer.cc index faea8751687..7814a259464 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_transfer.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_transfer.cc @@ -403,7 +403,7 @@ static void transfer_attribute_nearest(const GeometrySet &src_geometry, data_type); for (const int i : IndexRange(tot_samples)) { if (pointcloud_distances_sq[i] < mesh_distances_sq[i]) { - /* Point-cloud point is closer. */ + /* Point cloud point is closer. */ const int index = pointcloud_indices[i]; pointcloud_src_attribute.varray.get(index, buffer); dst_attribute->set_by_relocate(i, buffer); diff --git a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc index cc3387f5f2e..cfa6b752993 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc @@ -501,7 +501,7 @@ class NearestTransferFunction : public fn::MultiFunction { Array<int> mesh_indices; Array<float> mesh_distances; - /* If there is a point-cloud, find the closest points. */ + /* If there is a point cloud, find the closest points. */ if (use_points_) { point_indices.reinitialize(tot_samples); if (use_mesh_) { |