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

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

@ -298,7 +298,7 @@ struct InstanceContext {
curves(gather_info.curves.attributes.size()), curves(gather_info.curves.attributes.size()),
instances(gather_info.instances_attriubutes.size()) instances(gather_info.instances_attriubutes.size())
{ {
// empty //empty
} }
}; };
@ -735,7 +735,7 @@ static void gather_realize_tasks_recursive(GatherTasksInfo &gather_info,
* is an instance, the condition is true only when the depth is exactly 0. Additionally, the * is an instance, the condition is true only when the depth is exactly 0. Additionally, the
* function extends its operation to instances if any of their nested children meet the first * function extends its operation to instances if any of their nested children meet the first
* condition. * condition.
* *
* Based on bke::GeometrySet::attribute_foreach * Based on bke::GeometrySet::attribute_foreach
*/ */
static bool attribute_foreach(const bke::GeometrySet &geometry_set, static bool attribute_foreach(const bke::GeometrySet &geometry_set,
@ -805,11 +805,12 @@ static bool attribute_foreach(const bke::GeometrySet &geometry_set,
return is_relevant; return is_relevant;
} }
/** /**
* Based on bke::GeometrySet::gather_attributes_for_propagation. * Based on bke::GeometrySet::gather_attributes_for_propagation.
* Specialized for Specialized attribute_foreach to get: * Specialized for Specialized attribute_foreach to get:
* current_depth, depth_target, instance_depth and selection. * current_depth, depth_target, instance_depth and selection.
*/ */
void static gather_attributes_for_propagation( void static gather_attributes_for_propagation(
bke::GeometrySet re_geometry_set, bke::GeometrySet re_geometry_set,
const Span<bke::GeometryComponent::Type> component_types, const Span<bke::GeometryComponent::Type> component_types,
@ -850,8 +851,7 @@ void static gather_attributes_for_propagation(
AttrDomain domain = meta_data.domain; AttrDomain domain = meta_data.domain;
if (dst_component_type != bke::GeometryComponent::Type::Instance && if (dst_component_type != bke::GeometryComponent::Type::Instance &&
domain == AttrDomain::Instance) domain == AttrDomain::Instance) {
{
domain = AttrDomain::Point; domain = AttrDomain::Point;
} }
@ -965,7 +965,7 @@ static void execute_instances_tasks(
continue; continue;
} }
const void *attribute_ptr; const void *attribute_ptr;
if (attribute_fallback_array[attribute_index] != nullptr) { if (attribute_fallback_array[attribute_index] != nullptr) {
attribute_ptr = attribute_fallback_array[attribute_index]; attribute_ptr = attribute_fallback_array[attribute_index];
} }