diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-17 15:15:06 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-17 15:15:06 +0300 |
commit | 267923604754a50064c04a925a841a6714253d72 (patch) | |
tree | fc55f50254c428b1c94f760988d7cd9a5c9f75cf /source/blender/simulation | |
parent | 3ef59121a49b986700747469850e02f6420ee8aa (diff) |
Cleanup: avoid static initialization order issues when accessing CPPTypes
Instead of depending on static initialization order of globals use
static variables within functions. Those are initialized on first use.
This is every so slighly less efficient, but avoids a full class of problems.
Diffstat (limited to 'source/blender/simulation')
-rw-r--r-- | source/blender/simulation/intern/simulation_update.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/simulation/intern/simulation_update.cc b/source/blender/simulation/intern/simulation_update.cc index 918d433cb3d..95c7b122e7c 100644 --- a/source/blender/simulation/intern/simulation_update.cc +++ b/source/blender/simulation/intern/simulation_update.cc @@ -34,7 +34,6 @@ #include "NOD_node_tree_multi_function.hh" #include "FN_attributes_ref.hh" -#include "FN_cpp_types.hh" #include "FN_multi_function_network_evaluation.hh" #include "FN_multi_function_network_optimization.hh" @@ -108,7 +107,7 @@ static Map<const fn::MFOutputSocket *, std::string> deduplicate_attribute_nodes( Array<std::string> attribute_names{amount, NoInitialization()}; for (uint i : IndexRange(amount)) { params.add_uninitialized_single_output( - fn::GMutableSpan(fn::CPPType_string, attribute_names.data() + i, 1)); + fn::GMutableSpan(fn::CPPType::get<std::string>(), attribute_names.data() + i, 1)); } fn::MFContextBuilder context; |