diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-21 15:09:44 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-21 15:10:42 +0300 |
| commit | 269c184ac925a9f1bfc7ecefb4cc3c333b51ebb0 (patch) | |
| tree | 7bfbada4dbbdb8bea04bffd3c61abb53b7e99cb2 /source/blender/io/common | |
| parent | 6b6970d43fb7c69f59269219e7573b2b9d2da887 (diff) | |
Cleanup: IO, renamed `delete_object_writer()` → `release_writer()`
The function is called for all writers, not just 'object' writers.
Furthermore, it's called by the function `release_writers()`, so now the
name is consistent with that as well.
No functional changes.
Diffstat (limited to 'source/blender/io/common')
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h index 2669f137fd4..a274847e109 100644 --- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h +++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h @@ -340,7 +340,7 @@ class AbstractHierarchyIterator { virtual AbstractHierarchyWriter *create_particle_writer(const HierarchyContext *context) = 0; /* Called by release_writers() to free what the create_XXX_writer() functions allocated. */ - virtual void delete_object_writer(AbstractHierarchyWriter *writer) = 0; + virtual void release_writer(AbstractHierarchyWriter *writer) = 0; AbstractHierarchyWriter *get_writer(const std::string &export_path) const; ExportChildren &graph_children(const HierarchyContext *parent_context); diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc index 3622c1eb7cd..8c9245ef9b0 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc @@ -165,7 +165,7 @@ void AbstractHierarchyIterator::iterate_and_write() void AbstractHierarchyIterator::release_writers() { for (WriterMap::value_type it : writers_) { - delete_object_writer(it.second); + release_writer(it.second); } writers_.clear(); } diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc index 266c865ee52..ff073416574 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc @@ -91,7 +91,7 @@ class TestingHierarchyIterator : public AbstractHierarchyIterator { return new TestHierarchyWriter("particle", particle_writers); } - void delete_object_writer(AbstractHierarchyWriter *writer) override + void release_writer(AbstractHierarchyWriter *writer) override { delete writer; } |