[Bf-blender-cvs] [8d06a216081] temp-alembic-exporter-T73363-ms2: Cleanup: Alembic, made AbstractHierarchyIterator::get_object_data_path protected
Sybren A. Stüvel
noreply at git.blender.org
Tue Apr 28 18:57:33 CEST 2020
Commit: 8d06a2160816542f5a7c385ef45e2cc027b23766
Author: Sybren A. Stüvel
Date: Tue Apr 28 14:46:28 2020 +0200
Branches: temp-alembic-exporter-T73363-ms2
https://developer.blender.org/rB8d06a2160816542f5a7c385ef45e2cc027b23766
Cleanup: Alembic, made AbstractHierarchyIterator::get_object_data_path protected
There is no need for this function to be called from outside the class
hierarchy.
No functional changes.
===================================================================
M source/blender/io/usd/intern/abstract_hierarchy_iterator.h
===================================================================
diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
index 9738687b382..fcd3cfca781 100644
--- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
@@ -193,11 +193,6 @@ class AbstractHierarchyIterator {
* NULL-safe: when `id == nullptr` this returns an empty string. */
virtual std::string get_id_name(const ID *id) const;
- /* Given a HierarchyContext of some Object *, return an export path that is valid for its
- * object->data. Overriding is necessary when the exported format does NOT expect the object's
- * data to be a child of the object. */
- virtual std::string get_object_data_path(const HierarchyContext *context) const;
-
private:
void debug_print_export_graph(const ExportGraph &graph) const;
@@ -241,6 +236,11 @@ class AbstractHierarchyIterator {
virtual std::string path_concatenate(const std::string &parent_path,
const std::string &child_path) const;
+ /* Given a HierarchyContext of some Object *, return an export path that is valid for its
+ * object->data. Overriding is necessary when the exported format does NOT expect the object's
+ * data to be a child of the object. */
+ virtual std::string get_object_data_path(const HierarchyContext *context) const;
+
/* Return whether this object should be marked as 'weak export' or not.
*
* When this returns false, writers for the transform and data are created,
More information about the Bf-blender-cvs
mailing list