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_action.h | 100 +++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 43 deletions(-) (limited to 'source/blender/blenkernel/BKE_action.h') diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index e1fc5e118c4..08237be0a21 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -46,7 +46,10 @@ extern "C" { /* Allocate a new bAction with the given name */ struct bAction *BKE_action_add(struct Main *bmain, const char name[]); -void BKE_action_copy_data(struct Main *bmain, struct bAction *act_dst, const struct bAction *act_src, const int flag); +void BKE_action_copy_data(struct Main *bmain, + struct bAction *act_dst, + const struct bAction *act_src, + const int flag); /* Allocate a copy of the given Action and all its data */ struct bAction *BKE_action_copy(struct Main *bmain, const struct bAction *act_src); @@ -55,39 +58,40 @@ void BKE_action_free(struct bAction *act); void BKE_action_make_local(struct Main *bmain, struct bAction *act, const bool lib_local); - /* Action API ----------------- */ /* types of transforms applied to the given item * - these are the return flags for action_get_item_transforms() */ typedef enum eAction_TransformFlags { - /* location */ - ACT_TRANS_LOC = (1 << 0), - /* rotation */ - ACT_TRANS_ROT = (1 << 1), - /* scaling */ - ACT_TRANS_SCALE = (1 << 2), - - /* bbone shape - for all the parameters, provided one is set */ - ACT_TRANS_BBONE = (1 << 3), - - /* strictly not a transform, but custom properties are also - * quite often used in modern rigs - */ - ACT_TRANS_PROP = (1 << 4), - - /* all flags */ - ACT_TRANS_ONLY = (ACT_TRANS_LOC | ACT_TRANS_ROT | ACT_TRANS_SCALE), - ACT_TRANS_ALL = (ACT_TRANS_ONLY | ACT_TRANS_PROP), + /* location */ + ACT_TRANS_LOC = (1 << 0), + /* rotation */ + ACT_TRANS_ROT = (1 << 1), + /* scaling */ + ACT_TRANS_SCALE = (1 << 2), + + /* bbone shape - for all the parameters, provided one is set */ + ACT_TRANS_BBONE = (1 << 3), + + /* strictly not a transform, but custom properties are also + * quite often used in modern rigs + */ + ACT_TRANS_PROP = (1 << 4), + + /* all flags */ + ACT_TRANS_ONLY = (ACT_TRANS_LOC | ACT_TRANS_ROT | ACT_TRANS_SCALE), + ACT_TRANS_ALL = (ACT_TRANS_ONLY | ACT_TRANS_PROP), } eAction_TransformFlags; /* Return flags indicating which transforms the given object/posechannel has * - if 'curves' is provided, a list of links to these curves are also returned * whose nodes WILL NEED FREEING */ -short action_get_item_transforms(struct bAction *act, struct Object *ob, struct bPoseChannel *pchan, ListBase *curves); - +short action_get_item_transforms(struct bAction *act, + struct Object *ob, + struct bPoseChannel *pchan, + ListBase *curves); /* Some kind of bounding box operation on the action */ void calc_action_range(const struct bAction *act, float *start, float *end, short incl_modifiers); @@ -110,7 +114,9 @@ void action_group_colors_sync(struct bActionGroup *grp, const struct bActionGrou struct bActionGroup *action_groups_add_new(struct bAction *act, const char name[]); /* Add given channel into (active) group */ -void action_groups_add_channel(struct bAction *act, struct bActionGroup *agrp, struct FCurve *fcurve); +void action_groups_add_channel(struct bAction *act, + struct bActionGroup *agrp, + struct FCurve *fcurve); /* Remove the given channel from all groups */ void action_groups_remove_channel(struct bAction *act, struct FCurve *fcu); @@ -123,28 +129,31 @@ void action_groups_clear_tempflags(struct bAction *act); /* Pose API ----------------- */ -void BKE_pose_channel_free(struct bPoseChannel *pchan); -void BKE_pose_channel_free_ex(struct bPoseChannel *pchan, bool do_id_user); +void BKE_pose_channel_free(struct bPoseChannel *pchan); +void BKE_pose_channel_free_ex(struct bPoseChannel *pchan, bool do_id_user); -void BKE_pose_channel_free_bbone_cache(struct bPoseChannel *pchan); +void BKE_pose_channel_free_bbone_cache(struct bPoseChannel *pchan); -void BKE_pose_channels_free(struct bPose *pose); -void BKE_pose_channels_free_ex(struct bPose *pose, bool do_id_user); +void BKE_pose_channels_free(struct bPose *pose); +void BKE_pose_channels_free_ex(struct bPose *pose, bool do_id_user); -void BKE_pose_channels_hash_make(struct bPose *pose); -void BKE_pose_channels_hash_free(struct bPose *pose); +void BKE_pose_channels_hash_make(struct bPose *pose); +void BKE_pose_channels_hash_free(struct bPose *pose); -void BKE_pose_channels_remove( - struct Object *ob, - bool (*filter_fn)(const char *bone_name, void *user_data), void *user_data); +void BKE_pose_channels_remove(struct Object *ob, + bool (*filter_fn)(const char *bone_name, void *user_data), + void *user_data); -void BKE_pose_free_data_ex(struct bPose *pose, bool do_id_user); -void BKE_pose_free_data(struct bPose *pose); -void BKE_pose_free(struct bPose *pose); -void BKE_pose_free_ex(struct bPose *pose, bool do_id_user); -void BKE_pose_copy_data_ex(struct bPose **dst, const struct bPose *src, const int flag, const bool copy_constraints); -void BKE_pose_copy_data(struct bPose **dst, const struct bPose *src, const bool copy_constraints); -void BKE_pose_channel_copy_data(struct bPoseChannel *pchan, const struct bPoseChannel *pchan_from); +void BKE_pose_free_data_ex(struct bPose *pose, bool do_id_user); +void BKE_pose_free_data(struct bPose *pose); +void BKE_pose_free(struct bPose *pose); +void BKE_pose_free_ex(struct bPose *pose, bool do_id_user); +void BKE_pose_copy_data_ex(struct bPose **dst, + const struct bPose *src, + const int flag, + const bool copy_constraints); +void BKE_pose_copy_data(struct bPose **dst, const struct bPose *src, const bool copy_constraints); +void BKE_pose_channel_copy_data(struct bPoseChannel *pchan, const struct bPoseChannel *pchan_from); struct bPoseChannel *BKE_pose_channel_find_name(const struct bPose *pose, const char *name); struct bPoseChannel *BKE_pose_channel_active(struct Object *ob); struct bPoseChannel *BKE_pose_channel_verify(struct bPose *pose, const char *name); @@ -189,10 +198,16 @@ void BKE_pose_remove_group_index(struct bPose *pose, const int index); /* Assorted Evaluation ----------------- */ /* Used for the Action Constraint */ -void what_does_obaction(struct Object *ob, struct Object *workob, struct bPose *pose, struct bAction *act, char groupname[], float cframe); +void what_does_obaction(struct Object *ob, + struct Object *workob, + struct bPose *pose, + struct bAction *act, + char groupname[], + float cframe); /* for proxy */ -void BKE_pose_copyesult_pchan_result(struct bPoseChannel *pchanto, const struct bPoseChannel *pchanfrom); +void BKE_pose_copyesult_pchan_result(struct bPoseChannel *pchanto, + const struct bPoseChannel *pchanfrom); bool BKE_pose_copy_result(struct bPose *to, struct bPose *from); /* clear all transforms */ void BKE_pose_rest(struct bPose *pose); @@ -200,7 +215,6 @@ void BKE_pose_rest(struct bPose *pose); /* Tag pose for recalc. Also tag all related data to be recalc. */ void BKE_pose_tag_recalc(struct Main *bmain, struct bPose *pose); - #ifdef __cplusplus }; #endif -- cgit v1.2.3