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

6
source/blender/blenkernel/BKE_geometry_set.hh
View File

@ -237,9 +237,8 @@ struct GeometrySet {
const GeometryComponent &component)>; const GeometryComponent &component)>;
bool attribute_foreach(Span<GeometryComponent::Type> component_types, bool attribute_foreach(Span<GeometryComponent::Type> component_types,
bool include_instances, int current_depth,
const int current_depth, int depth_target,
const int depth_target,
const VArray<int> instance_depth, const VArray<int> instance_depth,
const IndexMask selection, const IndexMask selection,
AttributeForeachCallback callback) const; AttributeForeachCallback callback) const;
@ -261,7 +260,6 @@ struct GeometrySet {
void gather_attributes_for_propagation(Span<GeometryComponent::Type> component_types, void gather_attributes_for_propagation(Span<GeometryComponent::Type> component_types,
GeometryComponent::Type dst_component_type, GeometryComponent::Type dst_component_type,
bool include_instances,
const VArray<int> instance_depth, const VArray<int> instance_depth,
const IndexMask selection, const IndexMask selection,
const AnonymousAttributePropagationInfo &propagation_info, const AnonymousAttributePropagationInfo &propagation_info,

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

@ -575,7 +575,6 @@ GreasePencil *GeometrySet::get_grease_pencil_for_write()
} }
bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> component_types, bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> component_types,
const bool include_instances,
const int current_depth, const int current_depth,
const int depth_target, const int depth_target,
const VArray<int> instance_depth, const VArray<int> instance_depth,
@ -598,7 +597,7 @@ bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> componen
bool is_child_has_component = true; bool is_child_has_component = true;
// Process instances if required and instances are available. // Process instances if required and instances are available.
if (include_instances && this->has_instances()) { if (this->has_instances()) {
is_child_has_component = false; is_child_has_component = false;
// Iterate over instances based on the selection index mask. // Iterate over instances based on the selection index mask.
@ -620,7 +619,6 @@ bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> componen
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 = instance_geometry_set.attribute_foreach(component_types, is_child_has_component = instance_geometry_set.attribute_foreach(component_types,
include_instances,
current_depth + 1, current_depth + 1,
depth_target_tmp, depth_target_tmp,
instance_depth, instance_depth,
@ -776,7 +774,6 @@ void GeometrySet::gather_attributes_for_propagation(
void GeometrySet::gather_attributes_for_propagation( void GeometrySet::gather_attributes_for_propagation(
const Span<GeometryComponent::Type> component_types, const Span<GeometryComponent::Type> component_types,
const GeometryComponent::Type dst_component_type, const GeometryComponent::Type dst_component_type,
bool include_instances,
const VArray<int> instance_depth, const VArray<int> instance_depth,
const IndexMask selection, const IndexMask selection,
const AnonymousAttributePropagationInfo &propagation_info, const AnonymousAttributePropagationInfo &propagation_info,
@ -787,7 +784,6 @@ void GeometrySet::gather_attributes_for_propagation(
const GeometryComponentPtr dummy_component = GeometryComponent::create(dst_component_type); const GeometryComponentPtr dummy_component = GeometryComponent::create(dst_component_type);
this->attribute_foreach( this->attribute_foreach(
component_types, component_types,
include_instances,
0, 0,
-1, -1,
instance_depth, instance_depth,

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

@ -763,7 +763,6 @@ static OrderedAttributes gather_generic_instance_attributes_to_propagate(
Map<AttributeIDRef, AttributeKind> attributes_to_propagate; Map<AttributeIDRef, AttributeKind> attributes_to_propagate;
in_geometry_set.gather_attributes_for_propagation(src_component_types, in_geometry_set.gather_attributes_for_propagation(src_component_types,
bke::GeometryComponent::Type::Instance, bke::GeometryComponent::Type::Instance,
true,
options.depths, options.depths,
options.selection, options.selection,
options.propagation_info, options.propagation_info,
@ -793,7 +792,6 @@ static OrderedAttributes gather_generic_pointcloud_attributes_to_propagate(
Map<AttributeIDRef, AttributeKind> attributes_to_propagate; Map<AttributeIDRef, AttributeKind> attributes_to_propagate;
in_geometry_set.gather_attributes_for_propagation(src_component_types, in_geometry_set.gather_attributes_for_propagation(src_component_types,
bke::GeometryComponent::Type::PointCloud, bke::GeometryComponent::Type::PointCloud,
true,
options.depths, options.depths,
options.selection, options.selection,
options.propagation_info, options.propagation_info,
@ -1081,7 +1079,6 @@ static OrderedAttributes gather_generic_mesh_attributes_to_propagate(
Map<AttributeIDRef, AttributeKind> attributes_to_propagate; Map<AttributeIDRef, AttributeKind> attributes_to_propagate;
in_geometry_set.gather_attributes_for_propagation(src_component_types, in_geometry_set.gather_attributes_for_propagation(src_component_types,
bke::GeometryComponent::Type::Mesh, bke::GeometryComponent::Type::Mesh,
true,
options.depths, options.depths,
options.selection, options.selection,
options.propagation_info, options.propagation_info,
@ -1445,7 +1442,6 @@ static OrderedAttributes gather_generic_curve_attributes_to_propagate(
Map<AttributeIDRef, AttributeKind> attributes_to_propagate; Map<AttributeIDRef, AttributeKind> attributes_to_propagate;
in_geometry_set.gather_attributes_for_propagation(src_component_types, in_geometry_set.gather_attributes_for_propagation(src_component_types,
bke::GeometryComponent::Type::Curve, bke::GeometryComponent::Type::Curve,
true,
options.depths, options.depths,
options.selection, options.selection,
options.propagation_info, options.propagation_info,