diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-08-18 21:18:19 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-08-18 21:18:19 +0300 |
| commit | aa2822d137e555d30e9eacba9146e32c3663b401 (patch) | |
| tree | 149904c0deb279aa271885996e5092cccae15a6c /source/blender | |
| parent | 55b333d3e3cb18c0c546c292e1325b13f68c6f1c (diff) | |
cleanup
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/functions/FN_generic_virtual_array.hh | 2 | ||||
| -rw-r--r-- | source/blender/functions/intern/multi_function_network_evaluation.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh index c9398ceb547..f429243e2de 100644 --- a/source/blender/functions/FN_generic_virtual_array.hh +++ b/source/blender/functions/FN_generic_virtual_array.hh @@ -129,7 +129,7 @@ class GVArray { } /* Same as `get_internal_single`, but `r_value` points to initialized memory. */ - void get_single_to_uninitialized(void *r_value) const + void get_internal_single_to_uninitialized(void *r_value) const { type_->default_construct(r_value); this->get_internal_single(r_value); diff --git a/source/blender/functions/intern/multi_function_network_evaluation.cc b/source/blender/functions/intern/multi_function_network_evaluation.cc index 9a0cb0c35ce..41f8b1e6c96 100644 --- a/source/blender/functions/intern/multi_function_network_evaluation.cc +++ b/source/blender/functions/intern/multi_function_network_evaluation.cc @@ -851,7 +851,7 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__single(const MFInpu GMutableSpan span = static_cast<OutputSingleValue *>(to_any_value)->span; BLI_assert(span.size() == 1); const GVArray &virtual_array = this->get_single_input__single(input, scope); - virtual_array.get_single_to_uninitialized(span[0]); + virtual_array.get_internal_single_to_uninitialized(span[0]); return span; } @@ -869,7 +869,7 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__single(const MFInpu const GVArray &virtual_array = this->get_single_input__single(input, scope); void *new_buffer = allocator_.allocate(type.size(), type.alignment()); - virtual_array.get_single_to_uninitialized(new_buffer); + virtual_array.get_internal_single_to_uninitialized(new_buffer); GMutableSpan new_array_ref(type, new_buffer, 1); OwnSingleValue *new_value = |