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

Realize depth code review fixes #6

Merged
Arye Ramaty merged 10 commits from David-Haver/blender:realize-depth into WIP-realize-depth 2024-04-22 11:18:11 +02:00
Conversation 0 Commits 10 Files Changed 4 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b0a0b346bc - Show all commits

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

@ -763,7 +763,7 @@ static bool attribute_foreach(const bke::GeometrySet &geometry_set,
const bke::GeometrySet::AttributeForeachCallback callback) const bke::GeometrySet::AttributeForeachCallback callback)
{ {
/*Initialize flag to track if child instances have the specified components.*/ /* Initialize flag to track if child instances have the specified components.*/
bool child_has_component = true; bool child_has_component = true;
if (geometry_set.has_instances()) { if (geometry_set.has_instances()) {
@ -778,7 +778,7 @@ static bool attribute_foreach(const bke::GeometrySet &geometry_set,
const int depth_target_tmp = (0 == current_depth) ? instance_depth[i] : depth_target; const int depth_target_tmp = (0 == current_depth) ? instance_depth[i] : depth_target;
bke::GeometrySet instance_geometry_set = geometry_set_from_reference( bke::GeometrySet instance_geometry_set = geometry_set_from_reference(
instances.references()[instances.reference_handles()[i]]); instances.references()[instances.reference_handles()[i]]);
/*Process child instances with a recursive call.*/ /* Process child instances with a recursive call.*/
if (current_depth != depth_target_tmp) { if (current_depth != depth_target_tmp) {
child_has_component = child_has_component | attribute_foreach(instance_geometry_set, child_has_component = child_has_component | attribute_foreach(instance_geometry_set,
component_types, component_types,
@ -791,17 +791,17 @@ static bool attribute_foreach(const bke::GeometrySet &geometry_set,
} }
} }
/*Flag to track if any relevant attributes were found.*/ /* Flag to track if any relevant attributes were found.*/
bool is_relevant = false; bool is_relevant = false;
for (const bke::GeometryComponent::Type component_type : component_types) { for (const bke::GeometryComponent::Type component_type : component_types) {
if (geometry_set.has(component_type)) { if (geometry_set.has(component_type)) {
/*Check if the current instance components is the main one*/ /* Check if the current instance components is the main one*/
const bool is_special_instance = (bke::GeometryComponent::Type::Instance == const bool is_special_instance = (bke::GeometryComponent::Type::Instance ==
component_type) && component_type) &&
(component_types.size() > 1); (component_types.size() > 1);
if (!is_special_instance || child_has_component) { if (!is_special_instance || child_has_component) {
/*Process attributes for the current component.*/ /* Process attributes for the current component.*/
const bke::GeometryComponent &component = *geometry_set.get_component(component_type); const bke::GeometryComponent &component = *geometry_set.get_component(component_type);
const std::optional<bke::AttributeAccessor> attributes = component.attributes(); const std::optional<bke::AttributeAccessor> attributes = component.attributes();
if (attributes.has_value()) { if (attributes.has_value()) {