aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

davidhaver-WIP-realize-depth #3

Closed
David-Haver wants to merge 65 commits from David-Haver/blender-old:davidhaver-WIP-realize-depth into WIP-realize-depth
pull from: David-Haver/blender-old:davidhaver-WIP-realize-depth
merge into: aryeramaty:WIP-realize-depth

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 65 Files Changed 5 +22 -2
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec881e5845 - Show all commits

20
source/blender/geometry/intern/join_geometries.cc
View File

@ -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));
}
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,
const bke::AnonymousAttributePropagationInfo &propagation_info)
{

4
source/blender/geometry/intern/realize_instances.cc
View File

@ -1690,8 +1690,8 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
// Add the new GeometrySet to the Vector
geometries_to_merge.append(new_geometry_se);
}
new_geometry_set = geometry::join_geometries(geometries_to_merge, options.propagation_info);
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);
execute_realize_pointcloud_tasks(options,
all_pointclouds_info,