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
2 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 0e4f509040 - Show all commits

6
source/blender/geometry/GEO_join_geometries.hh
View File

@ -12,7 +12,7 @@ namespace blender::geometry {
bke::GeometrySet join_geometries(Span<bke::GeometrySet> geometries, bke::GeometrySet join_geometries(Span<bke::GeometrySet> geometries,
const bke::AnonymousAttributePropagationInfo &propagation_info); const bke::AnonymousAttributePropagationInfo &propagation_info);
void join_attributes(const Span<const GeometryComponent *> src_components, void join_attributes(const Span<const bke::GeometryComponent *> src_components,
GeometryComponent &r_result, bke::GeometryComponent &r_result,
const Span<StringRef> ignored_attributes = {}) const Span<StringRef> ignored_attributes = {})
} // namespace blender::geometry } // namespace blender::geometry

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

@ -74,8 +74,8 @@ static void fill_new_attribute(const Span<const GeometryComponent *> src_compone
} }
void join_attributes(const Span<const GeometryComponent *> src_components, void join_attributes(const Span<const GeometryComponent *> src_components,
GeometryComponent &result, GeometryComponent &result,
const Span<StringRef> ignored_attributes = {}) const Span<StringRef> ignored_attributes = {})
{ {
const Map<AttributeIDRef, AttributeMetaData> info = get_final_attribute_info(src_components, const Map<AttributeIDRef, AttributeMetaData> info = get_final_attribute_info(src_components,
ignored_attributes); ignored_attributes);