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/abc_util.cc | |
| parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
| parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern/abc_util.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 53860ab149d..90dfbd869f7 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -62,13 +62,13 @@ std::string get_id_name(const ID * const id) } /** - * @brief get_object_dag_path_name returns the name under which the object + * \brief get_object_dag_path_name returns the name under which the object * will be exported in the Alembic file. It is of the form * "[../grandparent/]parent/object" if dupli_parent is NULL, or * "dupli_parent/[../grandparent/]parent/object" otherwise. - * @param ob - * @param dupli_parent - * @return + * \param ob: + * \param dupli_parent: + * \return */ std::string get_object_dag_path_name(const Object * const ob, Object *dupli_parent) { |