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/blenkernel/intern/key.c | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/key.c')
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index a01d78f5c36..dce748e3ea3 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -166,7 +166,7 @@ Key *BKE_key_add(Main *bmain, ID *id) /* common function */ * * WARNING! This function will not handle ID user count! * - * \param flag Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more). + * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more). */ void BKE_key_copy_data(Main *UNUSED(bmain), Key *key_dst, const Key *key_src, const int UNUSED(flag)) { @@ -1481,9 +1481,9 @@ KeyBlock *BKE_keyblock_add(Key *key, const char *name) * \note sorting is a problematic side effect in some cases, * better only do this explicitly by having its own function, * - * \param key The key datablock to add to. - * \param name Optional name for the new keyblock. - * \param do_force always use ctime even for relative keys. + * \param key: The key datablock to add to. + * \param name: Optional name for the new keyblock. + * \param do_force: always use ctime even for relative keys. */ KeyBlock *BKE_keyblock_add_ctime(Key *key, const char *name, const bool do_force) { @@ -1807,11 +1807,11 @@ void BKE_keyblock_convert_to_mesh(KeyBlock *kb, Mesh *me) /** * Computes normals (vertices, polygons and/or loops ones) of given mesh for given shape key. * - * \param kb the KeyBlock to use to compute normals. - * \param mesh the Mesh to apply keyblock to. - * \param r_vertnors if non-NULL, an array of vectors, same length as number of vertices. - * \param r_polynors if non-NULL, an array of vectors, same length as number of polygons. - * \param r_loopnors if non-NULL, an array of vectors, same length as number of loops. + * \param kb: the KeyBlock to use to compute normals. + * \param mesh: the Mesh to apply keyblock to. + * \param r_vertnors: if non-NULL, an array of vectors, same length as number of vertices. + * \param r_polynors: if non-NULL, an array of vectors, same length as number of polygons. + * \param r_loopnors: if non-NULL, an array of vectors, same length as number of loops. */ void BKE_keyblock_mesh_calc_normals( struct KeyBlock *kb, struct Mesh *mesh, @@ -2053,7 +2053,7 @@ void BKE_keyblock_update_from_offset(Object *ob, KeyBlock *kb, float (*ofs)[3]) * the object's active shape index, the 'frame' value in case of absolute keys, etc. * Note indices are expected in real values (not 'fake' shapenr +1 ones). * - * \param org_index if < 0, current object's active shape will be used as skey to move. + * \param org_index: if < 0, current object's active shape will be used as skey to move. * \return true if something was done, else false. */ bool BKE_keyblock_move(Object *ob, int org_index, int new_index) |