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/object.c | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index af815175302..cb5cb96acd3 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -937,7 +937,7 @@ Object *BKE_object_add( /** * Add a new object, using another one as a reference * - * \param ob_src object to use to determine the collections of the new object. + * \param ob_src: object to use to determine the collections of the new object. */ Object *BKE_object_add_from( Main *bmain, Scene *scene, ViewLayer *view_layer, @@ -959,9 +959,9 @@ Object *BKE_object_add_from( * Add a new object, but assign the given datablock as the ob->data * for the newly created object. * - * \param data The datablock to assign as ob->data for the new object. + * \param data: The datablock to assign as ob->data for the new object. * This is assumed to be of the correct type. - * \param do_id_user If true, id_us_plus() will be called on data when + * \param do_id_user: If true, id_us_plus() will be called on data when * assigning it to the object. */ Object *BKE_object_add_for_data( @@ -1317,7 +1317,7 @@ void BKE_object_transform_copy(Object *ob_tar, const Object *ob_src) * * 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_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, const int flag) { @@ -2202,7 +2202,7 @@ void BKE_object_get_parent_matrix(Depsgraph *depsgraph, Scene *scene, Object *ob } /** - * \param r_originmat Optional matrix that stores the space the object is in (without its own matrix applied) + * \param r_originmat: Optional matrix that stores the space the object is in (without its own matrix applied) */ static void solve_parenting(Depsgraph *depsgraph, Scene *scene, Object *ob, Object *par, float obmat[4][4], float slowmat[4][4], @@ -2379,9 +2379,9 @@ void BKE_object_workob_calc_parent(Depsgraph *depsgraph, Scene *scene, Object *o /** * Applies the global transformation \a mat to the \a ob using a relative parent space if supplied. * - * \param mat the global transformation mat that the object should be set object to. - * \param parent the parent space in which this object will be set relative to (should probably always be parent_eval). - * \param use_compat true to ensure that rotations are set using the min difference between the old and new orientation. + * \param mat: the global transformation mat that the object should be set object to. + * \param parent: the parent space in which this object will be set relative to (should probably always be parent_eval). + * \param use_compat: true to ensure that rotations are set using the min difference between the old and new orientation. */ void BKE_object_apply_mat4_ex(Object *ob, float mat[4][4], Object *parent, float parentinv[4][4], const bool use_compat) { @@ -3725,8 +3725,8 @@ void BKE_object_groups_clear(Main *bmain, Object *ob) * * \note Only mesh objects currently support deforming, others are TODO. * - * \param ob - * \param r_tot + * \param ob: + * \param r_tot: * \return The kdtree or NULL if it can't be created. */ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot) |