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 +13 -8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dfc1b7867 - Show all commits

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

@ -191,7 +191,7 @@ static void join_component_type(const bke::GeometryComponent::Type component_typ
} }
void join_transform_instance_components(Span<const bke::InstancesComponent *> src_components, void join_transform_instance_components(const Span<const GeometryComponent *> src_components,
Span<blender::float4x4> src_base_transforms, Span<blender::float4x4> src_base_transforms,
GeometrySet &result) GeometrySet &result)
{ {
@ -201,26 +201,31 @@ void join_transform_instance_components(Span<const bke::InstancesComponent *> sr
} }
VArray<blender::float4x4>::ForSpan(src_base_transforms); VArray<blender::float4x4>::ForSpan(src_base_transforms);
std::unique_ptr<bke::Instances> dst_instances = std::make_unique<bke::Instances>(); std::unique_ptr<bke::Instances> dst_instances = std::make_unique<bke::Instances>();
int tot_instances = 0; int tot_instances = 0;
for (const bke::InstancesComponent *src_component : src_components) { for (const bke::GeometryComponent *src_component : src_components) {
tot_instances += src_component->get()->instances_num(); const bke::InstancesComponent &src_instance_component = static_cast<const bke::InstancesComponent &>(*src_component);
tot_instances += src_instance_component.get()->instances_num();
} }
// dst_instances->reserve(tot_instances); // dst_instances->reserve(tot_instances);
for (const int i:src_components.index_range()) for (const int i:src_components.index_range())
{ {
const bke::InstancesComponent *src_component = src_components[i]; const bke::GeometryComponent *src_component = src_components[i];
const bke::InstancesComponent &src_instance_component = static_cast<const bke::InstancesComponent &>(*src_component);
// const bke::InstancesComponent *src_component = src_components[i];
const blender::float4x4 &base_transform = src_base_transforms[i]; const blender::float4x4 &base_transform = src_base_transforms[i];
const bke::Instances &src_instances = *src_component->get(); const bke::Instances &src_instances = *src_instance_component.get();
Span<bke::InstanceReference> src_references = src_instances.references(); const Span<bke::InstanceReference> src_references = src_instances.references();
Array<int> handle_map(src_references.size()); Array<int> handle_map(src_references.size());
for (const int src_handle : src_references.index_range()) { for (const int src_handle : src_references.index_range()) {
handle_map[src_handle] = dst_instances->add_reference(src_references[src_handle]); handle_map[src_handle] = dst_instances->add_reference(src_references[src_handle]);
} }
Span<float4x4> src_transforms = src_instances.transforms(); const Span<float4x4> src_transforms = src_instances.transforms();
Span<int> src_reference_handles = src_instances.reference_handles(); const Span<int> src_reference_handles = src_instances.reference_handles();
for (const int i : src_transforms.index_range()) for (const int i : src_transforms.index_range())
{ {
const int src_handle = src_reference_handles[i]; const int src_handle = src_reference_handles[i];