forked from blender/blender
davidhaver-WIP-realize-depth #3
@ -190,6 +190,26 @@ static void join_component_type(const bke::GeometryComponent::Type component_typ
|
|||||||
result.add(joined_components.get_component_for_write(component_type));
|
result.add(joined_components.get_component_for_write(component_type));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void join_transform_instance_components(Span<const bke::InstancesComponent *> src_components,
|
||||||
|
Span<blender::float4x4> src_base_transforms,
|
||||||
|
GeometrySet &result)
|
||||||
|
{
|
||||||
|
if (src_components.is_empty()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (src_components.size() == 1){
|
||||||
|
result.add(*src_components.first());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
result.add(*src_components[0]);
|
||||||
|
result.add(*src_components[1]);
|
||||||
|
result.add(*src_components[2]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
GeometrySet join_geometries(const Span<GeometrySet> geometries,
|
GeometrySet join_geometries(const Span<GeometrySet> geometries,
|
||||||
const bke::AnonymousAttributePropagationInfo &propagation_info)
|
const bke::AnonymousAttributePropagationInfo &propagation_info)
|
||||||
{
|
{
|
||||||
|
@ -1690,8 +1690,8 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
|
|||||||
// Add the new GeometrySet to the Vector
|
// Add the new GeometrySet to the Vector
|
||||||
geometries_to_merge.append(new_geometry_se);
|
geometries_to_merge.append(new_geometry_se);
|
||||||
}
|
}
|
||||||
|
join_transform_instance_components(gather_info.instances_components_to_merge, gather_info.instances_components_transforms, new_geometry_set);
|
||||||
new_geometry_set = geometry::join_geometries(geometries_to_merge, options.propagation_info);
|
// new_geometry_set = geometry::join_geometries(geometries_to_merge, options.propagation_info);
|
||||||
|
|
||||||
execute_realize_pointcloud_tasks(options,
|
execute_realize_pointcloud_tasks(options,
|
||||||
all_pointclouds_info,
|
all_pointclouds_info,
|
||||||
|
Loading…
Reference in New Issue
Block a user