diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 04:55:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 05:02:09 +0300 |
commit | 49490e5cfbeb2b0b823aa2042401891001870a6e (patch) | |
tree | a1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/alembic/intern/alembic_capi.cc | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern/alembic_capi.cc')
-rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index c0daf9c3346..fbbfb4e7605 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -420,11 +420,11 @@ bool ABC_export( /** * Generates an AbcObjectReader for this Alembic object and its children. * - * \param object The Alembic IObject to visit. - * \param readers The created AbcObjectReader * will be appended to this vector. - * \param settings Import settings, not used directly but passed to the + * \param object: The Alembic IObject to visit. + * \param readers: The created AbcObjectReader * will be appended to this vector. + * \param settings: Import settings, not used directly but passed to the * AbcObjectReader subclass constructors. - * \param r_assign_as_parent Return parameter, contains a list of reader + * \param r_assign_as_parent: Return parameter, contains a list of reader * pointers, whose parent pointer should still be set. * This is filled when this call to visit_object() didn't create * a reader that should be the parent. |