Merge branch 'master' into blender2.8

3 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index d470488937a..ff1465103eb 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -140,8 +140,8 @@ static bool object_type_is_exportable(Scene *scene, 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 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,
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)
 {
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.