Merge branch 'master' into blender2.8

5 files changed, 39 insertions, 39 deletions

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index a2be7622537..f7cd7bc3786 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -476,7 +476,7 @@ typedef struct bAnimChannelType {
 	int (*setting_flag)(bAnimContext *ac, eAnimChannel_Settings setting, bool *neg);
 	/* get the pointer to int/short where data is stored,
 	 * with type being  sizeof(ptr_data) which should be fine for runtime use...
-	 *	- assume that setting has been checked to be valid for current context
+	 * - assume that setting has been checked to be valid for current context
 	 */
 	void *(*setting_ptr)(bAnimListElem *ale, eAnimChannel_Settings setting, short *type);
 } bAnimChannelType;
@@ -500,25 +500,25 @@ void ANIM_channel_draw_widgets(const struct bContext *C, bAnimContext *ac, bAnim
 /* Check if some setting for a channel is enabled
  * Returns: 1 = On, 0 = Off, -1 = Invalid
  *
- *  - setting: eAnimChannel_Settings
+ * - setting: eAnimChannel_Settings
  */
 short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, eAnimChannel_Settings setting);
 
 /* Change value of some setting for a channel
- *	- setting: eAnimChannel_Settings
- *	- mode: eAnimChannels_SetFlag
+ * - setting: eAnimChannel_Settings
+ * - mode: eAnimChannels_SetFlag
  */
 void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, eAnimChannel_Settings setting, eAnimChannels_SetFlag mode);
 
 
 /* Flush visibility (for Graph Editor) changes up/down hierarchy for changes in the given setting
- *	- anim_data: list of the all the anim channels that can be chosen
- *		-> filtered using ANIMFILTER_CHANNELS only, since if we took VISIBLE too,
- *		  then the channels under closed expanders get ignored...
- *	- ale_setting: the anim channel (not in the anim_data list directly, though occurring there)
- *		with the new state of the setting that we want flushed up/down the hierarchy
- *	- setting: type of setting to set
- *	- on: whether the visibility setting has been enabled or disabled
+ * - anim_data: list of the all the anim channels that can be chosen
+ *   -> filtered using ANIMFILTER_CHANNELS only, since if we took VISIBLE too,
+ *      then the channels under closed expanders get ignored...
+ * - ale_setting: the anim channel (not in the anim_data list directly, though occurring there)
+ *   with the new state of the setting that we want flushed up/down the hierarchy
+ * - setting: type of setting to set
+ * - on: whether the visibility setting has been enabled or disabled
  */
 void ANIM_flush_setting_anim_channels(bAnimContext *ac, ListBase *anim_data, bAnimListElem *ale_setting, eAnimChannel_Settings setting, eAnimChannels_SetFlag mode);
 
@@ -582,12 +582,12 @@ void ANIM_fmodifiers_copybuf_free(void);
 
 /* copy the given F-Modifiers to the buffer, returning whether anything was copied or not
  * assuming that the buffer has been cleared already with ANIM_fmodifiers_copybuf_free()
- *	- active: only copy the active modifier
+ * - active: only copy the active modifier
  */
 bool ANIM_fmodifiers_copy_to_buf(ListBase *modifiers, bool active);
 
 /* 'Paste' the F-Modifier(s) from the buffer to the specified list
- *	- replace: free all the existing modifiers to leave only the pasted ones
+ * - replace: free all the existing modifiers to leave only the pasted ones
  */
 bool ANIM_fmodifiers_paste_from_buf(ListBase *modifiers, bool replace, struct FCurve *curve);
 
@@ -662,9 +662,9 @@ float ANIM_unit_mapping_get_factor(struct Scene *scene, struct ID *id, struct FC
 #define BEZKEYTYPE(bezt) ((bezt)->hide)
 
 /* set/clear/toggle macro
- *	- channel - channel with a 'flag' member that we're setting
- *	- smode - 0=clear, 1=set, 2=invert
- *	- sflag - bitflag to set
+ * - channel - channel with a 'flag' member that we're setting
+ * - smode - 0=clear, 1=set, 2=invert
+ * - sflag - bitflag to set
  */
 #define ACHANNEL_SET_FLAG(channel, smode, sflag) \
 	{ \
@@ -674,9 +674,9 @@ float ANIM_unit_mapping_get_factor(struct Scene *scene, struct ID *id, struct FC
 	}
 
 /* set/clear/toggle macro, where the flag is negative
- *	- channel - channel with a 'flag' member that we're setting
- *	- smode - 0=clear, 1=set, 2=invert
- *	- sflag - bitflag to set
+ * - channel - channel with a 'flag' member that we're setting
+ * - smode - 0=clear, 1=set, 2=invert
+ * - sflag - bitflag to set
  */
 #define ACHANNEL_SET_FLAG_NEG(channel, smode, sflag) \
 	{ \
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 7bade53cdf4..48bf390ee71 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -70,7 +70,7 @@ typedef struct EditBone {
 	float head[3];          /* Orientation and length is implicit during editing */
 	float tail[3];
 	/* All joints are considered to have zero rotation with respect to
-	 * their parents.	Therefore any rotations specified during the
+	 * their parents. Therefore any rotations specified during the
 	 * animation are automatically relative to the bones' rest positions*/
 	int flag;
 	int layer;
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index 5787a63d324..e7ea5cf159e 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -216,11 +216,11 @@ typedef enum eKeyMergeMode {
 /* function for working with F-Curve data only (i.e. when filters have been chosen to explicitly use this) */
 short ANIM_fcurve_keyframes_loop(KeyframeEditData *ked, struct FCurve *fcu, KeyframeEditFunc key_ok, KeyframeEditFunc key_cb, FcuEditFunc fcu_cb);
 /* function for working with any type (i.e. one of the known types) of animation channel
- *  - filterflag is bDopeSheet->flag (DOPESHEET_FILTERFLAG)
+ * - filterflag is bDopeSheet->flag (DOPESHEET_FILTERFLAG)
  */
 short ANIM_animchannel_keyframes_loop(KeyframeEditData *ked, struct bDopeSheet *ads, struct bAnimListElem *ale, KeyframeEditFunc key_ok, KeyframeEditFunc key_cb, FcuEditFunc fcu_cb);
 /* same as above, except bAnimListElem wrapper is not needed...
- *  - keytype is eAnim_KeyType
+ * - keytype is eAnim_KeyType
  */
 short ANIM_animchanneldata_keyframes_loop(KeyframeEditData *ked, struct bDopeSheet *ads, void *data, int keytype, KeyframeEditFunc key_ok, KeyframeEditFunc key_cb, FcuEditFunc fcu_cb);
 
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 22e82d6b9ef..ed38e9cae58 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -62,7 +62,7 @@ struct EnumPropertyItem;
 /* ************ Keyframing Management **************** */
 
 /* Get the active settings for keyframing settings from context (specifically the given scene)
- *	- incl_mode: include settings from keyframing mode in the result (i.e. replace only)
+ * - incl_mode: include settings from keyframing mode in the result (i.e. replace only)
  */
 short ANIM_get_keyframing_flags(struct Scene *scene, short incl_mode);
 
@@ -106,16 +106,16 @@ int insert_vert_fcurve(struct FCurve *fcu, float x, float y, eBezTriple_Keyframe
 /* -------- */
 
 /* Secondary Keyframing API calls:
- *	Use this to insert a keyframe using the current value being keyframed, in the
- *	nominated F-Curve (no creation of animation data performed). Returns success.
+ * Use this to insert a keyframe using the current value being keyframed, in the
+ * nominated F-Curve (no creation of animation data performed). Returns success.
  */
 bool insert_keyframe_direct(struct Depsgraph *depsgraph, struct ReportList *reports, struct PointerRNA ptr, struct PropertyRNA *prop, struct FCurve *fcu, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
 
 /* -------- */
 
 /* Main Keyframing API calls:
- *	Use this to create any necessary animation data, and then insert a keyframe
- *	using the current value being keyframed, in the relevant place. Returns success.
+ * Use this to create any necessary animation data, and then insert a keyframe
+ * using the current value being keyframed, in the relevant place. Returns success.
  */
 short insert_keyframe(
         struct Main *bmain, struct Depsgraph *depsgraph, struct ReportList *reports, struct ID *id, struct bAction *act,
@@ -162,8 +162,8 @@ typedef struct KeyingSetInfo {
 
 	/* generate callbacks */
 	/* iterator to use to go through collections of data in context
-	 *  - this callback is separate from the 'adding' stage, allowing
-	 *    BuiltIn KeyingSets to be manually specified to use
+	 * - this callback is separate from the 'adding' stage, allowing
+	 *   BuiltIn KeyingSets to be manually specified to use
 	 */
 	cbKeyingSet_Iterator iter;
 	/* generator to use to add properties based on the data found by iterator */
@@ -312,8 +312,8 @@ bool ANIM_driver_can_paste(void);
 bool ANIM_copy_driver(struct ReportList *reports, struct ID *id, const char rna_path[], int array_index, short flag);
 
 /* Main Driver Management API calls:
- *  Add a new driver for the specified property on the given ID block or replace an existing one
- *	with the driver + driver-curve data from the buffer
+ * Add a new driver for the specified property on the given ID block or replace an existing one
+ * with the driver + driver-curve data from the buffer
  */
 bool ANIM_paste_driver(struct ReportList *reports, struct ID *id, const char rna_path[], int array_index, short flag);
 
@@ -356,22 +356,22 @@ bool autokeyframe_cfra_can_key(struct Scene *scene, struct ID *id);
 /* ************ Keyframe Checking ******************** */
 
 /* Lesser Keyframe Checking API call:
- *	- Used for the buttons to check for keyframes...
+ * - Used for the buttons to check for keyframes...
  */
 bool fcurve_frame_has_keyframe(struct FCurve *fcu, float frame, short filter);
 
 /* Main Keyframe Checking API call:
  * Checks whether a keyframe exists for the given ID-block one the given frame.
- *  - It is recommended to call this method over the other keyframe-checkers directly,
- *    in case some detail of the implementation changes...
- *	- frame: the value of this is quite often result of BKE_scene_frame_get()
+ * - It is recommended to call this method over the other keyframe-checkers directly,
+ *   in case some detail of the implementation changes...
+ * - frame: the value of this is quite often result of BKE_scene_frame_get()
  */
 bool id_frame_has_keyframe(struct ID *id, float frame, short filter);
 
 /* filter flags for id_cfra_has_keyframe
  *
  * WARNING: do not alter order of these, as also stored in files
- *	(for v3d->keyflags)
+ * (for v3d->keyflags)
  */
 typedef enum eAnimFilterFlags {
 	/* general */
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index cae55473534..f35976750c9 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -46,8 +46,8 @@
 
 /* Common View2D view types
  * NOTE: only define a type here if it completely sets all (+/- a few) of the relevant flags
- *	    and settings for a View2D region, and that set of settings is used in more
- *	    than one specific place
+ *       and settings for a View2D region, and that set of settings is used in more
+ *       than one specific place
  */
 enum eView2D_CommonViewTypes {
 	/* custom view type (region has defined all necessary flags already) */
@@ -121,7 +121,7 @@ enum eView2D_Gridlines {
 
 
 /* ------------------------------------------ */
-/* Macros:								*/
+/* Macros:                                    */
 
 /* test if mouse in a scrollbar (assume that scroller availability has been tested) */
 #define IN_2D_VERT_SCROLL(v2d, co)   (BLI_rcti_isect_pt_v(&v2d->vert, co))