blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix #119938: performance regression when adding output attribute #120177

Merged
Jacques Lucke merged 1 commits from JacquesLucke/blender:store-only-instance-attributes into main 2024-04-02 17:48:15 +02:00
Conversation 2 Commits 1 Files Changed 1 +13
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/nodes/intern/geometry_nodes_execute.cc
View File

@ -752,6 +752,19 @@ static void store_output_attributes(bke::GeometrySet &geometry,
if (outputs_by_domain.size() == 0) {
return;
}
const bool only_instance_attributes = outputs_by_domain.size() == 1 &&
*outputs_by_domain.keys().begin() ==
bke::AttrDomain::Instance;
if (only_instance_attributes) {
/* No need to call #modify_geometry_sets when only adding attributes to top-level instances.
* This avoids some unnecessary data copies currently if some sub-geometries are not yet owned
* by the geometry set, i.e. they use #GeometryOwnershipType::Editable/ReadOnly. */
Vector<OutputAttributeToStore> attributes_to_store = compute_attributes_to_store(
geometry, outputs_by_domain, true);
store_computed_output_attributes(geometry, attributes_to_store);
return;
}
geometry.modify_geometry_sets([&](bke::GeometrySet &instance_geometry) {
/* Instance attributes should only be created for the top-level geometry. */
const bool do_instances = &geometry == &instance_geometry;