blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix: Use "construct" instead of "assign" for uninitialized memory 

The realize instances code used "assign", but the attribute buffers on
the result aren't necessarily initialized. This doesn't make a difference
for trivial types like `int`, but it would with more complex types.
This commit is contained in:
Hans Goudey 2022-03-09 10:23:17 -06:00
parent 6c6f591f90
commit 115ff08fdb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,7 +646,7 @@ static void execute_realize_pointcloud_task(const RealizeInstancesOptions &optio
const GSpan src_span = *pointcloud_info.attributes[attribute_index];
threading::parallel_for(
IndexRange(pointcloud.totpoint), 1024, [&](const IndexRange range) {
cpp_type.copy_assign_n(
cpp_type.copy_construct_n(
src_span.slice(range).data(), dst_span.slice(range).data(), range.size());
});
}
@ -657,7 +657,7 @@ static void execute_realize_pointcloud_task(const RealizeInstancesOptions &optio
/* As the fallback value for the attribute. */
threading::parallel_for(
IndexRange(pointcloud.totpoint), 1024, [&](const IndexRange range) {
cpp_type.fill_assign_n(
cpp_type.fill_construct_n(
attribute_fallback, dst_span.slice(range).data(), range.size());
});
}
@ -943,9 +943,9 @@ static void execute_realize_mesh_task(const RealizeInstancesOptions &options,
const GSpan src_span = *mesh_info.attributes[attribute_index];
threading::parallel_for(
IndexRange(element_slice.size()), 1024, [&](const IndexRange sub_range) {
cpp_type.copy_assign_n(src_span.slice(sub_range).data(),
dst_span.slice(sub_range).data(),
sub_range.size());
cpp_type.copy_construct_n(src_span.slice(sub_range).data(),
dst_span.slice(sub_range).data(),
sub_range.size());
});
}
else {
@ -954,7 +954,7 @@ static void execute_realize_mesh_task(const RealizeInstancesOptions &options,
}
threading::parallel_for(
IndexRange(element_slice.size()), 1024, [&](const IndexRange sub_range) {
cpp_type.fill_assign_n(
cpp_type.fill_construct_n(
attribute_fallback, dst_span.slice(sub_range).data(), sub_range.size());
});
}
@ -1251,9 +1251,9 @@ static void execute_realize_curve_task(const RealizeInstancesOptions &options,
const GSpan src_span = *curves_info.attributes[attribute_index];
threading::parallel_for(
IndexRange(element_slice.size()), 1024, [&](const IndexRange sub_range) {
cpp_type.copy_assign_n(src_span.slice(sub_range).data(),
dst_span.slice(sub_range).data(),
sub_range.size());
cpp_type.copy_construct_n(src_span.slice(sub_range).data(),
dst_span.slice(sub_range).data(),
sub_range.size());
});
}
else {
@ -1262,7 +1262,7 @@ static void execute_realize_curve_task(const RealizeInstancesOptions &options,
}
threading::parallel_for(
IndexRange(element_slice.size()), 1024, [&](const IndexRange sub_range) {
cpp_type.fill_assign_n(
cpp_type.fill_construct_n(
attribute_fallback, dst_span.slice(sub_range).data(), sub_range.size());
});
}