diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 08:06:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 08:06:48 +0300 |
commit | 9649c6bef548a799ea620a4ac1abce7935849f2e (patch) | |
tree | 4d32a14aa4302cf4c965023cd955db24bb3359c2 /source/blender/alembic/intern | |
parent | cf7447dacbc3c5c0d5fb80e3b082d745e4955e12 (diff) | |
parent | 72c9141a7a56fa4762ac0daae501f1609532506c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern')
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 13 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_util.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index e3dd2b968be..680913e45ea 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -131,13 +131,12 @@ static bool object_type_is_exportable(Object *ob) /** * Returns whether this object should be exported into the Alembic file. * - * @param settings export settings, used for options like 'selected only'. - * @param ob the object's base in question. - * @param is_duplicated normally false; true when the object is instanced - * into the scene by a dupli-object (e.g. part of a - * dupligroup). This ignores selection and layer - * visibility, and assumes that the dupli-object itself - * (e.g. the group-instantiating empty) is exported. + * \param settings export settings, used for options like 'selected only'. + * \param ob the object's base in question. + * \param is_duplicated: Normally false; true when the object is instanced + * into the scene by a dupli-object (e.g. part of a dupligroup). + * This ignores selection and layer visibility, + * and assumes that the dupli-object itself (e.g. the group-instantiating empty) is exported. */ static bool export_object(const ExportSettings * const settings, const Base * const ob_base, bool is_duplicated) diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h index 4c6bd7d5412..fcc3b19c48b 100644 --- a/source/blender/alembic/intern/abc_util.h +++ b/source/blender/alembic/intern/abc_util.h @@ -33,7 +33,7 @@ #endif /** - * @brief The CacheReader struct is only used for anonymous pointers, + * \brief The CacheReader struct is only used for anonymous pointers, * to interface between C and C++ code. This library only creates * pointers to AbcObjectReader (or subclasses thereof). */ |