diff options
Diffstat (limited to 'source/blender/blenkernel/intern/geometry_set_instances.cc')
-rw-r--r-- | source/blender/blenkernel/intern/geometry_set_instances.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc index 1a260c5d48e..ce54ec7911f 100644 --- a/source/blender/blenkernel/intern/geometry_set_instances.cc +++ b/source/blender/blenkernel/intern/geometry_set_instances.cc @@ -371,14 +371,17 @@ 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. */ Map<std::string, AttributeKind> attributes; - gather_attribute_info(attributes, component_types, set_groups, {"position", "material_index"}); + gather_attribute_info(attributes, + component_types, + set_groups, + {"position", "material_index", "normal", "shade_smooth", "crease"}); join_attributes( set_groups, component_types, attributes, static_cast<GeometryComponent &>(dst_component)); } @@ -399,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)); } |