diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-24 13:38:04 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-24 13:38:04 +0300 |
commit | ec17b45034fbc9278bb42ea574bdaf2b8a6857e3 (patch) | |
tree | 5dc570917938696a2c83217a99de6d45a438cdee /source/blender/depsgraph/intern | |
parent | 236ca8fbe84575504f6ae80aec63c8059b875ef0 (diff) |
Depsgraph: use construct on first use idiom for graph registry
This is necessary to avoid false positive memory leaks.
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_registry.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.cc b/source/blender/depsgraph/intern/depsgraph_registry.cc index c9d03e47ded..623702ee3ae 100644 --- a/source/blender/depsgraph/intern/depsgraph_registry.cc +++ b/source/blender/depsgraph/intern/depsgraph_registry.cc @@ -30,29 +30,35 @@ namespace blender { namespace deg { -static RawMap<Main *, RawVectorSet<Depsgraph *>> g_graph_registry; +using GraphRegistry = Map<Main *, VectorSet<Depsgraph *>>; +static GraphRegistry &get_graph_registry() +{ + static GraphRegistry graph_registry; + return graph_registry; +} void register_graph(Depsgraph *depsgraph) { Main *bmain = depsgraph->bmain; - g_graph_registry.lookup_or_add_default(bmain).add_new(depsgraph); + get_graph_registry().lookup_or_add_default(bmain).add_new(depsgraph); } void unregister_graph(Depsgraph *depsgraph) { Main *bmain = depsgraph->bmain; - RawVectorSet<Depsgraph *> &graphs = g_graph_registry.lookup(bmain); + GraphRegistry &graph_registry = get_graph_registry(); + VectorSet<Depsgraph *> &graphs = graph_registry.lookup(bmain); graphs.remove(depsgraph); // If this was the last depsgraph associated with the main, remove the main entry as well. if (graphs.is_empty()) { - g_graph_registry.remove(bmain); + graph_registry.remove(bmain); } } Span<Depsgraph *> get_all_registered_graphs(Main *bmain) { - RawVectorSet<Depsgraph *> *graphs = g_graph_registry.lookup_ptr(bmain); + VectorSet<Depsgraph *> *graphs = get_graph_registry().lookup_ptr(bmain); if (graphs != nullptr) { return *graphs; } |