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

6
source/blender/blenkernel/intern/geometry_set.cc
View File

@ -614,13 +614,13 @@ bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> componen
if (reference.type() == InstanceReference::Type::GeometrySet) { if (reference.type() == InstanceReference::Type::GeometrySet) {
bke::GeometrySet instance_geometry_set = reference.geometry_set(); bke::GeometrySet instance_geometry_set = reference.geometry_set();
if (current_depth != depth_target_tmp) { if (current_depth != depth_target_tmp) {
is_child_has_component = is_child_has_component || is_child_has_component = instance_geometry_set.attribute_foreach(component_types,
instance_geometry_set.attribute_foreach(component_types,
current_depth + 1, current_depth + 1,
depth_target_tmp, depth_target_tmp,
instance_depth, instance_depth,
selection, selection,
callback); callback) ||
is_child_has_component;
} }
} }
} }

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

@ -332,7 +332,7 @@ static void realize_collections(Collection *collection, bke::Instances *instance
float4x4 transform = float4x4::identity(); float4x4 transform = float4x4::identity();
transform.location() -= float3(collection->instance_offset); transform.location() -= float3(collection->instance_offset);
transform *= child_object->object_to_world(); transform *= child_object->object_to_world();
instances->add_instance(handle, transform);instances->add_instance(handle, transform); instances->add_instance(handle, transform);
} }
} }