Merge branch 'master' into blender2.8

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 8ec75bda538..7567adc50dc 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -69,7 +69,7 @@ void BKE_action_make_local(struct Main *bmain, struct bAction *act, const bool l
 
 /* Action API ----------------- */
 
-/* types of transforms applied to the given item 
+/* types of transforms applied to the given item
  *  - these are the return falgs for action_get_item_transforms()
  */
 typedef enum eAction_TransformFlags {
@@ -79,21 +79,21 @@ typedef enum eAction_TransformFlags {
 	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 
+/* 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
  */
@@ -132,7 +132,7 @@ struct bActionGroup *BKE_action_group_find_name(struct bAction *act, const char
 /* Clear all 'temp' flags on all groups */
 void action_groups_clear_tempflags(struct bAction *act);
 
-/* Pose API ----------------- */	
+/* Pose API ----------------- */
 
 void                 BKE_pose_channel_free(struct bPoseChannel *pchan);
 void                 BKE_pose_channel_free_ex(struct bPoseChannel *pchan, bool do_id_user);
@@ -185,7 +185,7 @@ bool BKE_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan)
 // XXX to be deprecated for a more general solution in animsys...
 void framechange_poses_clear_unkeyed(struct Main *bmain);
 
-/* Bone Groups API --------------------- */	
+/* Bone Groups API --------------------- */
 
 /* Adds a new bone-group */
 struct bActionGroup *BKE_pose_add_group(struct bPose *pose, const char *name);
@@ -195,7 +195,7 @@ void BKE_pose_remove_group(struct bPose *pose, struct bActionGroup *grp, const i
 /* Remove the matching bone-group from its index */
 void BKE_pose_remove_group_index(struct bPose *pose, const int index);
 
-/* Assorted Evaluation ----------------- */	
+/* 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);