From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/blenkernel/BKE_key.h | 77 ++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 36 deletions(-) (limited to 'source/blender/blenkernel/BKE_key.h') diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h index d0d558cb829..58ad3f6230d 100644 --- a/source/blender/blenkernel/BKE_key.h +++ b/source/blender/blenkernel/BKE_key.h @@ -38,30 +38,30 @@ struct WeightsArrayCache; extern "C" { #endif -void BKE_key_free(struct Key *sc); -void BKE_key_free_nolib(struct Key *key); +void BKE_key_free(struct Key *sc); +void BKE_key_free_nolib(struct Key *key); struct Key *BKE_key_add(struct Main *bmain, struct ID *id); -void BKE_key_copy_data(struct Main *bmain, struct Key *key_dst, const struct Key *key_src, const int flag); +void BKE_key_copy_data(struct Main *bmain, + struct Key *key_dst, + const struct Key *key_src, + const int flag); struct Key *BKE_key_copy(struct Main *bmain, const struct Key *key); struct Key *BKE_key_copy_nolib(struct Key *key); -void BKE_key_sort(struct Key *key); +void BKE_key_sort(struct Key *key); void key_curve_position_weights(float t, float data[4], int type); void key_curve_tangent_weights(float t, float data[4], int type); void key_curve_normal_weights(float t, float data[4], int type); -float *BKE_key_evaluate_object_ex( - struct Object *ob, int *r_totelem, - float *arr, size_t arr_size); -float *BKE_key_evaluate_object( - struct Object *ob, int *r_totelem); +float *BKE_key_evaluate_object_ex(struct Object *ob, int *r_totelem, float *arr, size_t arr_size); +float *BKE_key_evaluate_object(struct Object *ob, int *r_totelem); bool BKE_key_idtype_support(const short id_type); -struct Key **BKE_key_from_id_p(struct ID *id); -struct Key *BKE_key_from_id(struct ID *id); -struct Key **BKE_key_from_object_p(const struct Object *ob); -struct Key *BKE_key_from_object(const struct Object *ob); +struct Key **BKE_key_from_id_p(struct ID *id); +struct Key *BKE_key_from_id(struct ID *id); +struct Key **BKE_key_from_object_p(const struct Object *ob); +struct Key *BKE_key_from_object(const struct Object *ob); struct KeyBlock *BKE_keyblock_from_object(struct Object *ob); struct KeyBlock *BKE_keyblock_from_object_reference(struct Object *ob); @@ -69,39 +69,44 @@ struct KeyBlock *BKE_keyblock_add(struct Key *key, const char *name); struct KeyBlock *BKE_keyblock_add_ctime(struct Key *key, const char *name, const bool do_force); struct KeyBlock *BKE_keyblock_from_key(struct Key *key, int index); struct KeyBlock *BKE_keyblock_find_name(struct Key *key, const char name[]); -void BKE_keyblock_copy_settings(struct KeyBlock *kb_dst, const struct KeyBlock *kb_src); -char *BKE_keyblock_curval_rnapath_get(struct Key *key, struct KeyBlock *kb); +void BKE_keyblock_copy_settings(struct KeyBlock *kb_dst, const struct KeyBlock *kb_src); +char *BKE_keyblock_curval_rnapath_get(struct Key *key, struct KeyBlock *kb); /* conversion functions */ /* Note: 'update_from' versions do not (re)allocate mem in kb, while 'convert_from' do. */ -void BKE_keyblock_update_from_lattice(struct Lattice *lt, struct KeyBlock *kb); -void BKE_keyblock_convert_from_lattice(struct Lattice *lt, struct KeyBlock *kb); -void BKE_keyblock_convert_to_lattice(struct KeyBlock *kb, struct Lattice *lt); - -int BKE_keyblock_curve_element_count(struct ListBase *nurb); -void BKE_keyblock_update_from_curve(struct Curve *cu, struct KeyBlock *kb, struct ListBase *nurb); -void BKE_keyblock_convert_from_curve(struct Curve *cu, struct KeyBlock *kb, struct ListBase *nurb); -void BKE_keyblock_convert_to_curve(struct KeyBlock *kb, struct Curve *cu, struct ListBase *nurb); - -void BKE_keyblock_update_from_mesh(struct Mesh *me, struct KeyBlock *kb); -void BKE_keyblock_convert_from_mesh(struct Mesh *me, struct Key *key, struct KeyBlock *kb); -void BKE_keyblock_convert_to_mesh(struct KeyBlock *kb, struct Mesh *me); -void BKE_keyblock_mesh_calc_normals( - struct KeyBlock *kb, struct Mesh *mesh, float (*r_vertnors)[3], float (*r_polynors)[3], float (*r_loopnors)[3]); - -void BKE_keyblock_update_from_vertcos(struct Object *ob, struct KeyBlock *kb, float (*vertCos)[3]); -void BKE_keyblock_convert_from_vertcos(struct Object *ob, struct KeyBlock *kb, float (*vertCos)[3]); +void BKE_keyblock_update_from_lattice(struct Lattice *lt, struct KeyBlock *kb); +void BKE_keyblock_convert_from_lattice(struct Lattice *lt, struct KeyBlock *kb); +void BKE_keyblock_convert_to_lattice(struct KeyBlock *kb, struct Lattice *lt); + +int BKE_keyblock_curve_element_count(struct ListBase *nurb); +void BKE_keyblock_update_from_curve(struct Curve *cu, struct KeyBlock *kb, struct ListBase *nurb); +void BKE_keyblock_convert_from_curve(struct Curve *cu, struct KeyBlock *kb, struct ListBase *nurb); +void BKE_keyblock_convert_to_curve(struct KeyBlock *kb, struct Curve *cu, struct ListBase *nurb); + +void BKE_keyblock_update_from_mesh(struct Mesh *me, struct KeyBlock *kb); +void BKE_keyblock_convert_from_mesh(struct Mesh *me, struct Key *key, struct KeyBlock *kb); +void BKE_keyblock_convert_to_mesh(struct KeyBlock *kb, struct Mesh *me); +void BKE_keyblock_mesh_calc_normals(struct KeyBlock *kb, + struct Mesh *mesh, + float (*r_vertnors)[3], + float (*r_polynors)[3], + float (*r_loopnors)[3]); + +void BKE_keyblock_update_from_vertcos(struct Object *ob, struct KeyBlock *kb, float (*vertCos)[3]); +void BKE_keyblock_convert_from_vertcos(struct Object *ob, + struct KeyBlock *kb, + float (*vertCos)[3]); float (*BKE_keyblock_convert_to_vertcos(struct Object *ob, struct KeyBlock *kb))[3]; -void BKE_keyblock_update_from_offset(struct Object *ob, struct KeyBlock *kb, float (*ofs)[3]); +void BKE_keyblock_update_from_offset(struct Object *ob, struct KeyBlock *kb, float (*ofs)[3]); /* other management */ -bool BKE_keyblock_move(struct Object *ob, int org_index, int new_index); +bool BKE_keyblock_move(struct Object *ob, int org_index, int new_index); -bool BKE_keyblock_is_basis(struct Key *key, const int index); +bool BKE_keyblock_is_basis(struct Key *key, const int index); #ifdef __cplusplus }; #endif -#endif /* __BKE_KEY_H__ */ +#endif /* __BKE_KEY_H__ */ -- cgit v1.2.3