[Bf-blender-cvs] [c3570ab51da] master: Cleanup: USD, made AbstractHierarchyIterator::get_writer const
Sybren A. Stüvel
noreply at git.blender.org
Fri May 8 15:10:56 CEST 2020
Commit: c3570ab51da8ac21b15d735a4613c0804fc14a64
Author: Sybren A. Stüvel
Date: Fri May 8 14:19:03 2020 +0200
Branches: master
https://developer.blender.org/rBc3570ab51da8ac21b15d735a4613c0804fc14a64
Cleanup: USD, made AbstractHierarchyIterator::get_writer const
No functional changes.
===================================================================
M source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
M source/blender/io/usd/intern/abstract_hierarchy_iterator.h
===================================================================
diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
index 060a65a68eb..7045161ff45 100644
--- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
@@ -607,9 +607,10 @@ std::string AbstractHierarchyIterator::get_object_data_name(const Object *object
return get_id_name(object_data);
}
-AbstractHierarchyWriter *AbstractHierarchyIterator::get_writer(const std::string &export_path)
+AbstractHierarchyWriter *AbstractHierarchyIterator::get_writer(
+ const std::string &export_path) const
{
- WriterMap::iterator it = writers_.find(export_path);
+ WriterMap::const_iterator it = writers_.find(export_path);
if (it == writers_.end()) {
return nullptr;
diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
index 89ea31c7037..e31d5c91252 100644
--- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
@@ -204,7 +204,7 @@ 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);
+ AbstractHierarchyWriter *get_writer(const std::string &export_path) const;
typedef AbstractHierarchyWriter *(AbstractHierarchyIterator::*create_writer_func)(
const HierarchyContext *);
More information about the Bf-blender-cvs
mailing list