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

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

@ -637,7 +637,8 @@ static void gather_realize_tasks_recursive(GatherTasksInfo &gather_info,
const auto &instances_component = *static_cast<const bke::InstancesComponent *>(component); const auto &instances_component = *static_cast<const bke::InstancesComponent *>(component);
// gather_info.instances_components_to_merge.append(instances_component); // gather_info.instances_components_to_merge.append(instances_component);
// gather_info.instances_components_transforms.append(base_transform); // gather_info.instances_components_transforms.append(base_transform);
} }
else{
const auto &instances_component = *static_cast<const bke::InstancesComponent *>(component); const auto &instances_component = *static_cast<const bke::InstancesComponent *>(component);
const Instances *instances = instances_component.get(); const Instances *instances = instances_component.get();
if (instances != nullptr && instances->instances_num() > 0) { if (instances != nullptr && instances->instances_num() > 0) {
@ -648,6 +649,7 @@ static void gather_realize_tasks_recursive(GatherTasksInfo &gather_info,
base_transform, base_transform,
base_instance_context); base_instance_context);
} }
}
break; break;
} }
case bke::GeometryComponent::Type::Volume: { case bke::GeometryComponent::Type::Volume: {