Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-03-10 13:53:17 +0300
committerJacques Lucke <jacques@blender.org>2021-03-10 13:53:31 +0300
commit368647bd25d6bb0b32f5e439838c06e0e46ac8da (patch)
treec7c427ef51416358d34413b67f74836db3f96e47 /source/blender/blenkernel/intern/geometry_set_instances.cc
parent122fefcc8589a09d4e89ed3045f29f07ec6564e9 (diff)
Geometry Nodes: move geometry component type enum to C
This allows us to use it in rna for the spreadsheet editor.
Diffstat (limited to 'source/blender/blenkernel/intern/geometry_set_instances.cc')
-rw-r--r--source/blender/blenkernel/intern/geometry_set_instances.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc
index f3006385da3..70b48a253ed 100644
--- a/source/blender/blenkernel/intern/geometry_set_instances.cc
+++ b/source/blender/blenkernel/intern/geometry_set_instances.cc
@@ -371,9 +371,9 @@ static void join_instance_groups_mesh(Span<GeometryInstanceGroup> set_groups,
dst_component.replace(new_mesh);
Vector<GeometryComponentType> component_types;
- component_types.append(GeometryComponentType::Mesh);
+ component_types.append(GEO_COMPONENT_TYPE_MESH);
if (convert_points_to_vertices) {
- component_types.append(GeometryComponentType::PointCloud);
+ component_types.append(GEO_COMPONENT_TYPE_POINT_CLOUD);
}
/* Don't copy attributes that are stored directly in the mesh data structs. */
@@ -402,9 +402,9 @@ static void join_instance_groups_pointcloud(Span<GeometryInstanceGroup> set_grou
PointCloud *pointcloud = BKE_pointcloud_new_nomain(totpoint);
dst_component.replace(pointcloud);
Map<std::string, AttributeKind> attributes;
- gather_attribute_info(attributes, {GeometryComponentType::PointCloud}, set_groups, {});
+ gather_attribute_info(attributes, {GEO_COMPONENT_TYPE_POINT_CLOUD}, set_groups, {});
join_attributes(set_groups,
- {GeometryComponentType::PointCloud},
+ {GEO_COMPONENT_TYPE_POINT_CLOUD},
attributes,
static_cast<GeometryComponent &>(dst_component));
}