archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: IO, renamed delete_object_writer() → release_writer()

Browse Source 
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.
This commit is contained in:
Sybren A. Stüvel
2020-07-21 14:09:44 +02:00
parent 6b6970d43f
commit 269c184ac9
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
View File

@@ -89,7 +89,7 @@ bool ABCHierarchyIterator::mark_as_weak_export(const Object *object) const
return false; return false;
} }
void ABCHierarchyIterator::delete_object_writer(AbstractHierarchyWriter *writer) void ABCHierarchyIterator::release_writer(AbstractHierarchyWriter *writer)
{ {
delete writer; delete writer;
} }

2
source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
View File

@@ -78,7 +78,7 @@ class ABCHierarchyIterator : public AbstractHierarchyIterator {
virtual AbstractHierarchyWriter *create_particle_writer( virtual AbstractHierarchyWriter *create_particle_writer(
const HierarchyContext *context) override; const HierarchyContext *context) override;
virtual void delete_object_writer(AbstractHierarchyWriter *writer) override; virtual void release_writer(AbstractHierarchyWriter *writer) override;
private: private:
Alembic::Abc::OObject get_alembic_parent(const HierarchyContext *context) const; Alembic::Abc::OObject get_alembic_parent(const HierarchyContext *context) const;

2
source/blender/io/common/IO_abstract_hierarchy_iterator.h
View File

@@ -340,7 +340,7 @@ class AbstractHierarchyIterator {
virtual AbstractHierarchyWriter *create_particle_writer(const HierarchyContext *context) = 0; virtual AbstractHierarchyWriter *create_particle_writer(const HierarchyContext *context) = 0;
/* Called by release_writers() to free what the create_XXX_writer() functions allocated. */ /* 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; AbstractHierarchyWriter *get_writer(const std::string &export_path) const;
ExportChildren &graph_children(const HierarchyContext *parent_context); ExportChildren &graph_children(const HierarchyContext *parent_context);

2
source/blender/io/common/intern/abstract_hierarchy_iterator.cc
View File

@@ -165,7 +165,7 @@ void AbstractHierarchyIterator::iterate_and_write()
void AbstractHierarchyIterator::release_writers() void AbstractHierarchyIterator::release_writers()
{ {
for (WriterMap::value_type it : writers_) { for (WriterMap::value_type it : writers_) {
delete_object_writer(it.second); release_writer(it.second);
} }
writers_.clear(); writers_.clear();
} }

2
source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
View File

@@ -91,7 +91,7 @@ class TestingHierarchyIterator : public AbstractHierarchyIterator {
return new TestHierarchyWriter("particle", particle_writers); return new TestHierarchyWriter("particle", particle_writers);
} }
void delete_object_writer(AbstractHierarchyWriter *writer) override void release_writer(AbstractHierarchyWriter *writer) override
{ {
delete writer; delete writer;
} }

2
source/blender/io/usd/intern/usd_hierarchy_iterator.cc
View File

@@ -61,7 +61,7 @@ bool USDHierarchyIterator::mark_as_weak_export(const Object *object) const
return false; return false;
} }
void USDHierarchyIterator::delete_object_writer(AbstractHierarchyWriter *writer) void USDHierarchyIterator::release_writer(AbstractHierarchyWriter *writer)
{ {
delete static_cast<USDAbstractWriter *>(writer); delete static_cast<USDAbstractWriter *>(writer);
} }

2
source/blender/io/usd/intern/usd_hierarchy_iterator.h
View File

@@ -66,7 +66,7 @@ class USDHierarchyIterator : public AbstractHierarchyIterator {
virtual AbstractHierarchyWriter *create_particle_writer( virtual AbstractHierarchyWriter *create_particle_writer(
const HierarchyContext *context) override; const HierarchyContext *context) override;
virtual void delete_object_writer(AbstractHierarchyWriter *writer) override; virtual void release_writer(AbstractHierarchyWriter *writer) override;
private: private:
USDExporterContext create_usd_export_context(const HierarchyContext *context); USDExporterContext create_usd_export_context(const HierarchyContext *context);