[Bf-blender-cvs] [3ceb9faf1a6] master: Cleanup: IO, made some functions in `AbstractHierarchyIterator` protected
Sybren A. Stüvel
noreply at git.blender.org
Fri Jun 19 16:49:48 CEST 2020
Commit: 3ceb9faf1a628dea203f41e49d99503c2f8df65b
Author: Sybren A. Stüvel
Date: Fri Jun 19 15:42:53 2020 +0200
Branches: master
https://developer.blender.org/rB3ceb9faf1a628dea203f41e49d99503c2f8df65b
Cleanup: IO, made some functions in `AbstractHierarchyIterator` protected
These functions are not needed in the public interface, only by the
`AbstractHierarchyIterator` class and its subclasses.
No functional changes.
===================================================================
M source/blender/io/common/IO_abstract_hierarchy_iterator.h
===================================================================
diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
index 8cac3f4c72d..2f0c1b270f1 100644
--- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h
+++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
@@ -239,7 +239,6 @@ class AbstractHierarchyIterator {
Object *duplicator,
const std::set<Object *> &dupli_set);
- ExportChildren &graph_children(const HierarchyContext *parent_context);
void context_update_for_graph_index(HierarchyContext *context,
const ExportGraph::key_type &graph_index) const;
@@ -260,8 +259,6 @@ class AbstractHierarchyIterator {
std::string get_object_name(const Object *object) const;
std::string get_object_data_name(const Object *object) const;
- AbstractHierarchyWriter *get_writer(const std::string &export_path) const;
-
typedef AbstractHierarchyWriter *(AbstractHierarchyIterator::*create_writer_func)(
const HierarchyContext *);
/* Ensure that a writer exists; if it doesn't, call create_func(context).
@@ -313,6 +310,9 @@ class AbstractHierarchyIterator {
/* Called by release_writers() to free what the create_XXX_writer() functions allocated. */
virtual void delete_object_writer(AbstractHierarchyWriter *writer) = 0;
+
+ AbstractHierarchyWriter *get_writer(const std::string &export_path) const;
+ ExportChildren &graph_children(const HierarchyContext *parent_context);
};
} // namespace io
More information about the Bf-blender-cvs
mailing list