Merge branch 'master' into blender2.8

1 files changed, 147 insertions, 147 deletions

diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 17a527d2cda..c443c66d0f5 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -29,7 +29,7 @@
  *  \ingroup edanimation
  */
 
- 
+
 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>
@@ -84,10 +84,10 @@ static int keyingset_poll_default_add(bContext *C)
 static int keyingset_poll_active_edit(bContext *C)
 {
 	Scene *scene = CTX_data_scene(C);
-	
+
 	if (scene == NULL)
 		return 0;
-	
+
 	/* there must be an active KeyingSet (and KeyingSets) */
 	return ((scene->active_keyingset > 0) && (scene->keyingsets.first));
 }
@@ -97,42 +97,42 @@ static int keyingset_poll_activePath_edit(bContext *C)
 {
 	Scene *scene = CTX_data_scene(C);
 	KeyingSet *ks;
-	
+
 	if (scene == NULL)
 		return 0;
 	if (scene->active_keyingset <= 0)
 		return 0;
 	else
 		ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
-	
+
 	/* there must be an active KeyingSet and an active path */
 	return ((ks) && (ks->paths.first) && (ks->active_path > 0));
 }
 
- 
+
 /* Add a Default (Empty) Keying Set ------------------------- */
 
 static int add_default_keyingset_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
 	short flag = 0, keyingflag = 0;
-	
-	/* validate flags 
+
+	/* validate flags
 	 *	- absolute KeyingSets should be created by default
 	 */
 	flag |= KEYINGSET_ABSOLUTE;
-	
+
 	/* 2nd arg is 0 to indicate that we don't want to include autokeying mode related settings */
 	keyingflag = ANIM_get_keyframing_flags(scene, 0);
-	
+
 	/* call the API func, and set the active keyingset index */
 	BKE_keyingset_add(&scene->keyingsets, NULL, NULL, flag, keyingflag);
-	
+
 	scene->active_keyingset = BLI_listbase_count(&scene->keyingsets);
-	
+
 	/* send notifiers */
 	WM_event_add_notifier(C, NC_SCENE | ND_KEYINGSET, NULL);
-	
+
 	return OPERATOR_FINISHED;
 }
 
@@ -142,7 +142,7 @@ void ANIM_OT_keying_set_add(wmOperatorType *ot)
 	ot->name = "Add Empty Keying Set";
 	ot->idname = "ANIM_OT_keying_set_add";
 	ot->description = "Add a new (empty) Keying Set to the active Scene";
-	
+
 	/* callbacks */
 	ot->exec = add_default_keyingset_exec;
 	ot->poll = keyingset_poll_default_add;
@@ -154,7 +154,7 @@ static int remove_active_keyingset_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	KeyingSet *ks;
-	
+
 	/* verify the Keying Set to use:
 	 *	- use the active one
 	 *	- return error if it doesn't exist
@@ -169,17 +169,17 @@ static int remove_active_keyingset_exec(bContext *C, wmOperator *op)
 	}
 	else
 		ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
-	
+
 	/* free KeyingSet's data, then remove it from the scene */
 	BKE_keyingset_free(ks);
 	BLI_freelinkN(&scene->keyingsets, ks);
-	
+
 	/* the active one should now be the previously second-to-last one */
 	scene->active_keyingset--;
-	
+
 	/* send notifiers */
 	WM_event_add_notifier(C, NC_SCENE | ND_KEYINGSET, NULL);
-	
+
 	return OPERATOR_FINISHED;
 }
 
@@ -189,7 +189,7 @@ void ANIM_OT_keying_set_remove(wmOperatorType *ot)
 	ot->name = "Remove Active Keying Set";
 	ot->idname = "ANIM_OT_keying_set_remove";
 	ot->description = "Remove the active Keying Set";
-	
+
 	/* callbacks */
 	ot->exec = remove_active_keyingset_exec;
 	ot->poll = keyingset_poll_active_edit;
@@ -202,7 +202,7 @@ static int add_empty_ks_path_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	KeyingSet *ks;
 	KS_Path *ksp;
-	
+
 	/* verify the Keying Set to use:
 	 *	- use the active one
 	 *	- return error if it doesn't exist
@@ -213,16 +213,16 @@ static int add_empty_ks_path_exec(bContext *C, wmOperator *op)
 	}
 	else
 		ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
-	
+
 	/* don't use the API method for this, since that checks on values... */
 	ksp = MEM_callocN(sizeof(KS_Path), "KeyingSetPath Empty");
 	BLI_addtail(&ks->paths, ksp);
 	ks->active_path = BLI_listbase_count(&ks->paths);
-	
+
 	ksp->groupmode = KSP_GROUP_KSNAME; // XXX?
 	ksp->idtype = ID_OB;
 	ksp->flag = KSP_FLAG_WHOLE_ARRAY;
-	
+
 	return OPERATOR_FINISHED;
 }
 
@@ -232,7 +232,7 @@ void ANIM_OT_keying_set_path_add(wmOperatorType *ot)
 	ot->name = "Add Empty Keying Set Path";
 	ot->idname = "ANIM_OT_keying_set_path_add";
 	ot->description = "Add empty path to active Keying Set";
-	
+
 	/* callbacks */
 	ot->exec = add_empty_ks_path_exec;
 	ot->poll = keyingset_poll_active_edit;
@@ -244,15 +244,15 @@ static int remove_active_ks_path_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	KeyingSet *ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
-	
+
 	/* if there is a KeyingSet, find the nominated path to remove */
 	if (ks) {
 		KS_Path *ksp = BLI_findlink(&ks->paths, ks->active_path - 1);
-		
+
 		if (ksp) {
 			/* remove the active path from the KeyingSet */
 			BKE_keyingset_free_path(ks, ksp);
-			
+
 			/* the active path should now be the previously second-to-last active one */
 			ks->active_path--;
 		}
@@ -265,7 +265,7 @@ static int remove_active_ks_path_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "No active keying set to remove a path from");
 		return OPERATOR_CANCELLED;
 	}
-	
+
 	return OPERATOR_FINISHED;
 }
 
@@ -275,7 +275,7 @@ void ANIM_OT_keying_set_path_remove(wmOperatorType *ot)
 	ot->name = "Remove Active Keying Set Path";
 	ot->idname = "ANIM_OT_keying_set_path_remove";
 	ot->description = "Remove active Path from active Keying Set";
-	
+
 	/* callbacks */
 	ot->exec = remove_active_ks_path_exec;
 	ot->poll = keyingset_poll_activePath_edit;
@@ -296,33 +296,33 @@ static int add_keyingset_button_exec(bContext *C, wmOperator *op)
 	short success = 0;
 	int index = 0, pflag = 0;
 	const bool all = RNA_boolean_get(op->ptr, "all");
-	
+
 	/* try to add to keyingset using property retrieved from UI */
 	if (!UI_context_active_but_prop_get(C, &ptr, &prop, &index)) {
 		/* pass event on if no active button found */
 		return (OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH);
 	}
-	
+
 	/* verify the Keying Set to use:
 	 *	- use the active one for now (more control over this can be added later)
-	 *	- add a new one if it doesn't exist 
+	 *	- add a new one if it doesn't exist
 	 */
 	if (scene->active_keyingset == 0) {
 		short flag = 0, keyingflag = 0;
-		
-		/* validate flags 
+
+		/* validate flags
 		 *	- absolute KeyingSets should be created by default
 		 */
 		flag |= KEYINGSET_ABSOLUTE;
-		
+
 		keyingflag |= ANIM_get_keyframing_flags(scene, 0);
-		
-		if (IS_AUTOKEY_FLAG(scene, XYZ2RGB)) 
+
+		if (IS_AUTOKEY_FLAG(scene, XYZ2RGB))
 			keyingflag |= INSERTKEY_XYZ2RGB;
-			
+
 		/* call the API func, and set the active keyingset index */
 		ks = BKE_keyingset_add(&scene->keyingsets, "ButtonKeyingSet", "Button Keying Set", flag, keyingflag);
-		
+
 		scene->active_keyingset = BLI_listbase_count(&scene->keyingsets);
 	}
 	else if (scene->active_keyingset < 0) {
@@ -332,41 +332,41 @@ static int add_keyingset_button_exec(bContext *C, wmOperator *op)
 	else {
 		ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
 	}
-	
+
 	/* check if property is able to be added */
 	if (ptr.id.data && ptr.data && prop && RNA_property_animateable(&ptr, prop)) {
 		path = RNA_path_from_ID_to_property(&ptr, prop);
-		
+
 		if (path) {
 			/* set flags */
 			if (all) {
 				pflag |= KSP_FLAG_WHOLE_ARRAY;
-				
-				/* we need to set the index for this to 0, even though it may break in some cases, this is 
+
+				/* we need to set the index for this to 0, even though it may break in some cases, this is
 				 * necessary if we want the entire array for most cases to get included without the user
 				 * having to worry about where they clicked
 				 */
 				index = 0;
 			}
-				
+
 			/* add path to this setting */
 			BKE_keyingset_add_path(ks, ptr.id.data, NULL, path, index, pflag, KSP_GROUP_KSNAME);
 			ks->active_path = BLI_listbase_count(&ks->paths);
 			success = 1;
-			
+
 			/* free the temp path created */
 			MEM_freeN(path);
 		}
 	}
-	
+
 	if (success) {
 		/* send updates */
 		WM_event_add_notifier(C, NC_SCENE | ND_KEYINGSET, NULL);
-		
+
 		/* show notification/report header, so that users notice that something changed */
 		BKE_reportf(op->reports, RPT_INFO, "Property added to Keying Set: '%s'", ks->name);
 	}
-	
+
 	return (success) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
@@ -376,11 +376,11 @@ void ANIM_OT_keyingset_button_add(wmOperatorType *ot)
 	ot->name = "Add to Keying Set";
 	ot->idname = "ANIM_OT_keyingset_button_add";
 	ot->description = "Add current UI-active property to current keying set";
-	
+
 	/* callbacks */
-	ot->exec = add_keyingset_button_exec; 
+	ot->exec = add_keyingset_button_exec;
 	//op->poll = ???
-	
+
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
@@ -399,13 +399,13 @@ static int remove_keyingset_button_exec(bContext *C, wmOperator *op)
 	char *path = NULL;
 	short success = 0;
 	int index = 0;
-	
+
 	/* try to add to keyingset using property retrieved from UI */
 	if (UI_context_active_but_prop_get(C, &ptr, &prop, &index)) {
 		/* pass event on if no active button found */
 		return (OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH);
 	}
-	
+
 	/* verify the Keying Set to use:
 	 *	- use the active one for now (more control over this can be added later)
 	 *	- return error if it doesn't exist
@@ -421,35 +421,35 @@ static int remove_keyingset_button_exec(bContext *C, wmOperator *op)
 	else {
 		ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
 	}
-	
+
 	if (ptr.id.data && ptr.data && prop) {
 		path = RNA_path_from_ID_to_property(&ptr, prop);
-		
+
 		if (path) {
 			KS_Path *ksp;
-			
+
 			/* try to find a path matching this description */
 			ksp = BKE_keyingset_find_path(ks, ptr.id.data, ks->name, path, index, KSP_GROUP_KSNAME);
-			
+
 			if (ksp) {
 				BKE_keyingset_free_path(ks, ksp);
 				success = 1;
 			}
-			
+
 			/* free temp path used */
 			MEM_freeN(path);
 		}
 	}
-	
-	
+
+
 	if (success) {
 		/* send updates */
 		WM_event_add_notifier(C, NC_SCENE | ND_KEYINGSET, NULL);
-		
+
 		/* show warning */
 		BKE_report(op->reports, RPT_INFO, "Property removed from Keying Set");
 	}
-	
+
 	return (success) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
@@ -459,11 +459,11 @@ void ANIM_OT_keyingset_button_remove(wmOperatorType *ot)
 	ot->name = "Remove from Keying Set";
 	ot->idname = "ANIM_OT_keyingset_button_remove";
 	ot->description = "Remove current UI-active property from current keying set";
-	
+
 	/* callbacks */
-	ot->exec = remove_keyingset_button_exec; 
+	ot->exec = remove_keyingset_button_exec;
 	//op->poll = ???
-	
+
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
@@ -477,13 +477,13 @@ static int keyingset_active_menu_invoke(bContext *C, wmOperator *op, const wmEve
 {
 	uiPopupMenu *pup;
 	uiLayout *layout;
-	
+
 	/* call the menu, which will call this operator again, hence the canceled */
 	pup = UI_popup_menu_begin(C, op->type->name, ICON_NONE);
 	layout = UI_popup_menu_layout(pup);
 	uiItemsEnumO(layout, "ANIM_OT_keying_set_active_set", "type");
 	UI_popup_menu_end(C, pup);
-	
+
 	return OPERATOR_INTERFACE;
 }
 
@@ -491,33 +491,33 @@ static int keyingset_active_menu_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	int type = RNA_enum_get(op->ptr, "type");
-	
+
 	/* If type == 0, it will deselect any active keying set. */
 	scene->active_keyingset = type;
-	
+
 	/* send notifiers */
 	WM_event_add_notifier(C, NC_SCENE | ND_KEYINGSET, NULL);
-	
+
 	return OPERATOR_FINISHED;
 }
- 
+
 void ANIM_OT_keying_set_active_set(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
-	
+
 	/* identifiers */
 	ot->name = "Set Active Keying Set";
 	ot->idname = "ANIM_OT_keying_set_active_set";
 	ot->description = "Select a new keying set as the active one";
-	
+
 	/* callbacks */
 	ot->invoke = keyingset_active_menu_invoke;
-	ot->exec = keyingset_active_menu_exec; 
+	ot->exec = keyingset_active_menu_exec;
 	ot->poll = ED_operator_areaactive;
-	
+
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-	
+
 	/* keyingset to use (dynamic enum) */
 	prop = RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
 	RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf);
@@ -541,7 +541,7 @@ KeyingSetInfo *ANIM_keyingset_info_find_name(const char name[])
 	/* sanity checks */
 	if ((name == NULL) || (name[0] == 0))
 		return NULL;
-		
+
 	/* search by comparing names */
 	return BLI_findstring(&keyingset_type_infos, name, offsetof(KeyingSetInfo, idname));
 }
@@ -550,17 +550,17 @@ KeyingSetInfo *ANIM_keyingset_info_find_name(const char name[])
 KeyingSet *ANIM_builtin_keyingset_get_named(KeyingSet *prevKS, const char name[])
 {
 	KeyingSet *ks, *first = NULL;
-	
+
 	/* sanity checks  any name to check? */
 	if (name[0] == 0)
 		return NULL;
-	
+
 	/* get first KeyingSet to use */
 	if (prevKS && prevKS->next)
 		first = prevKS->next;
 	else
 		first = builtin_keyingsets.first;
-	
+
 	/* loop over KeyingSets checking names */
 	for (ks = first; ks; ks = ks->next) {
 		if (STREQ(name, ks->idname))
@@ -582,18 +582,18 @@ KeyingSet *ANIM_builtin_keyingset_get_named(KeyingSet *prevKS, const char name[]
 void ANIM_keyingset_info_register(KeyingSetInfo *ksi)
 {
 	KeyingSet *ks;
-	
-	/* create a new KeyingSet 
+
+	/* create a new KeyingSet
 	 *	- inherit name and keyframing settings from the typeinfo
 	 */
 	ks = BKE_keyingset_add(&builtin_keyingsets, ksi->idname, ksi->name, 1, ksi->keyingflag);
-	
+
 	/* link this KeyingSet with its typeinfo */
 	memcpy(&ks->typeinfo, ksi->idname, sizeof(ks->typeinfo));
-	
+
 	/* Copy description... */
 	BLI_strncpy(ks->description, ksi->description, sizeof(ks->description));
-	
+
 	/* add type-info to the list */
 	BLI_addtail(&keyingset_type_infos, ksi);
 }
@@ -621,7 +621,7 @@ void ANIM_keyingset_info_unregister(Main *bmain, KeyingSetInfo *ksi)
 			MEM_freeN(ks);
 		}
 	}
-	
+
 	/* free the type info */
 	BLI_freelinkN(&keyingset_type_infos, ksi);
 }
@@ -631,17 +631,17 @@ void ANIM_keyingset_info_unregister(Main *bmain, KeyingSetInfo *ksi)
 void ANIM_keyingset_infos_exit(void)
 {
 	KeyingSetInfo *ksi, *next;
-	
+
 	/* free type infos */
 	for (ksi = keyingset_type_infos.first; ksi; ksi = next) {
 		next = ksi->next;
-		
+
 		/* free extra RNA data, and remove from list */
 		if (ksi->ext.free)
 			ksi->ext.free(ksi->ext.data);
 		BLI_freelinkN(&keyingset_type_infos, ksi);
 	}
-	
+
 	/* free builtin sets */
 	BKE_keyingsets_free(&builtin_keyingsets);
 }
@@ -667,7 +667,7 @@ KeyingSet *ANIM_scene_get_active_keyingset(Scene *scene)
 	/* if no scene, we've got no hope of finding the Keying Set */
 	if (scene == NULL)
 		return NULL;
-	
+
 	/* currently, there are several possibilities here:
 	 *	-   0: no active keying set
 	 *	- > 0: one of the user-defined Keying Sets, but indices start from 0 (hence the -1)
@@ -683,22 +683,22 @@ KeyingSet *ANIM_scene_get_active_keyingset(Scene *scene)
 int ANIM_scene_get_keyingset_index(Scene *scene, KeyingSet *ks)
 {
 	int index;
-	
+
 	/* if no KeyingSet provided, have none */
 	if (ks == NULL)
 		return 0;
-	
+
 	/* check if the KeyingSet exists in scene list */
 	if (scene) {
-		/* get index and if valid, return 
+		/* get index and if valid, return
 		 *	- (absolute) Scene KeyingSets are from (>= 1)
 		 */
 		index = BLI_findindex(&scene->keyingsets, ks);
 		if (index != -1)
 			return (index + 1);
 	}
-	
-	/* still here, so try builtins list too 
+
+	/* still here, so try builtins list too
 	 *	- builtins are from (<= -1)
 	 *	- none/invalid is (= 0)
 	 */
@@ -712,15 +712,15 @@ int ANIM_scene_get_keyingset_index(Scene *scene, KeyingSet *ks)
 /* Get Keying Set to use for Auto-Keyframing some transforms */
 KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformKSName)
 {
-	/* get KeyingSet to use 
-	 *	- use the active KeyingSet if defined (and user wants to use it for all autokeying), 
+	/* get KeyingSet to use
+	 *	- use the active KeyingSet if defined (and user wants to use it for all autokeying),
 	 *    or otherwise key transforms only
 	 */
 	if (IS_AUTOKEY_FLAG(scene, ONLYKEYINGSET) && (scene->active_keyingset))
 		return ANIM_scene_get_active_keyingset(scene);
 	else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL))
 		return ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_AVAILABLE_ID);
-	else 
+	else
 		return ANIM_builtin_keyingset_get_named(NULL, tranformKSName);
 }
 
@@ -738,8 +738,8 @@ const EnumPropertyItem *ANIM_keying_sets_enum_itemf(bContext *C, PointerRNA *UNU
 	if (C == NULL) {
 		return DummyRNA_DEFAULT_items;
 	}
-	
-	/* active Keying Set 
+
+	/* active Keying Set
 	 *	- only include entry if it exists
 	 */
 	if (scene->active_keyingset) {
@@ -748,14 +748,14 @@ const EnumPropertyItem *ANIM_keying_sets_enum_itemf(bContext *C, PointerRNA *UNU
 		item_tmp.name = "Active Keying Set";
 		item_tmp.value = i;
 		RNA_enum_item_add(&item, &totitem, &item_tmp);
-		
+
 		/* separator */
 		RNA_enum_item_add_separator(&item, &totitem);
 	}
-	
+
 	i++;
-	
-	/* user-defined Keying Sets 
+
+	/* user-defined Keying Sets
 	 *	- these are listed in the order in which they were defined for the active scene
 	 */
 	if (scene->keyingsets.first) {
@@ -768,11 +768,11 @@ const EnumPropertyItem *ANIM_keying_sets_enum_itemf(bContext *C, PointerRNA *UNU
 				RNA_enum_item_add(&item, &totitem, &item_tmp);
 			}
 		}
-		
+
 		/* separator */
 		RNA_enum_item_add_separator(&item, &totitem);
 	}
-	
+
 	/* builtin Keying Sets */
 	i = -1;
 	for (ks = builtin_keyingsets.first; ks; ks = ks->next, i--) {
@@ -802,7 +802,7 @@ bool ANIM_keyingset_context_ok_poll(bContext *C, KeyingSet *ks)
 {
 	if ((ks->flag & KEYINGSET_ABSOLUTE) == 0) {
 		KeyingSetInfo *ksi = ANIM_keyingset_info_find_name(ks->typeinfo);
-		
+
 		/* get the associated 'type info' for this KeyingSet */
 		if (ksi == NULL)
 			return 0;
@@ -811,13 +811,13 @@ bool ANIM_keyingset_context_ok_poll(bContext *C, KeyingSet *ks)
 		/* check if it can be used in the current context */
 		return (ksi->poll(ksi, C));
 	}
-	
+
 	return true;
 }
 
 /* Special 'Overrides' Iterator for Relative KeyingSets ------ */
 
-/* 'Data Sources' for relative Keying Set 'overrides' 
+/* 'Data Sources' for relative Keying Set 'overrides'
  *  - this is basically a wrapper for PointerRNA's in a linked list
  *	- do not allow this to be accessed from outside for now
  */
@@ -827,14 +827,14 @@ typedef struct tRKS_DSource {
 } tRKS_DSource;
 
 
-/* Iterator used for overriding the behavior of iterators defined for 
+/* Iterator used for overriding the behavior of iterators defined for
  * relative Keying Sets, with the main usage of this being operators
  * requiring Auto Keyframing. Internal Use Only!
  */
 static void RKS_ITER_overrides_list(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks, ListBase *dsources)
 {
 	tRKS_DSource *ds;
-	
+
 	for (ds = dsources->first; ds; ds = ds->next) {
 		/* run generate callback on this data */
 		ksi->generate(ksi, C, ks, &ds->ptr);
@@ -845,8 +845,8 @@ static void RKS_ITER_overrides_list(KeyingSetInfo *ksi, bContext *C, KeyingSet *
 void ANIM_relative_keyingset_add_source(ListBase *dsources, ID *id, StructRNA *srna, void *data)
 {
 	tRKS_DSource *ds;
-	
-	/* sanity checks 
+
+	/* sanity checks
 	 *	- we must have somewhere to output the data
 	 *	- we must have both srna+data (and with id too optionally), or id by itself only
 	 */
@@ -854,11 +854,11 @@ void ANIM_relative_keyingset_add_source(ListBase *dsources, ID *id, StructRNA *s
 		return;
 	if (ELEM(NULL, srna, data) && (id == NULL))
 		return;
-	
+
 	/* allocate new elem, and add to the list */
 	ds = MEM_callocN(sizeof(tRKS_DSource), "tRKS_DSource");
 	BLI_addtail(dsources, ds);
-	
+
 	/* depending on what data we have, create using ID or full pointer call */
 	if (srna && data)
 		RNA_pointer_create(id, srna, data, &ds->ptr);
@@ -880,31 +880,31 @@ short ANIM_validate_keyingset(bContext *C, ListBase *dsources, KeyingSet *ks)
 	/* sanity check */
 	if (ks == NULL)
 		return 0;
-	
+
 	/* if relative Keying Sets, poll and build up the paths */
 	if ((ks->flag & KEYINGSET_ABSOLUTE) == 0) {
 		KeyingSetInfo *ksi = ANIM_keyingset_info_find_name(ks->typeinfo);
-		
-		/* clear all existing paths 
+
+		/* clear all existing paths
 		 * NOTE: BKE_keyingset_free() frees all of the paths for the KeyingSet, but not the set itself
 		 */
 		BKE_keyingset_free(ks);
-		
+
 		/* get the associated 'type info' for this KeyingSet */
 		if (ksi == NULL)
 			return MODIFYKEY_MISSING_TYPEINFO;
 		/* TODO: check for missing callbacks! */
-		
+
 		/* check if it can be used in the current context */
 		if (ksi->poll(ksi, C)) {
 			/* if a list of data sources are provided, run a special iterator over them,
 			 * otherwise, just continue per normal
 			 */
-			if (dsources) 
+			if (dsources)
 				RKS_ITER_overrides_list(ksi, C, ks, dsources);
 			else
 				ksi->iter(ksi, C, ks);
-				
+
 			/* if we don't have any paths now, then this still qualifies as invalid context */
 			// FIXME: we need some error conditions (to be retrieved from the iterator why this failed!)
 			if (BLI_listbase_is_empty(&ks->paths))
@@ -916,16 +916,16 @@ short ANIM_validate_keyingset(bContext *C, ListBase *dsources, KeyingSet *ks)
 			return MODIFYKEY_INVALID_CONTEXT;
 		}
 	}
-	
+
 	/* succeeded; return 0 to tag error free */
 	return 0;
-} 
+}
 
 /* Determine which keying flags apply based on the override flags */
 static short keyingset_apply_keying_flags(const short base_flags, const short overrides, const short own_flags)
 {
 	short result = 0;
-	
+
 	/* The logic for whether a keying flag applies is as follows:
 	 *  - If the flag in question is set in "overrides", that means that the
 	 *    status of that flag in "own_flags" is used
@@ -939,14 +939,14 @@ static short keyingset_apply_keying_flags(const short base_flags, const short ov
 	else {                               \
 		result |= (base_flags & kflag);  \
 	}
-	
-	/* Apply the flags one by one... 
+
+	/* Apply the flags one by one...
 	 * (See rna_def_common_keying_flags() for the supported flags)
 	 */
 	APPLY_KEYINGFLAG_OVERRIDE(INSERTKEY_NEEDED)
 	APPLY_KEYINGFLAG_OVERRIDE(INSERTKEY_MATRIX)
 	APPLY_KEYINGFLAG_OVERRIDE(INSERTKEY_XYZ2RGB)
-	
+
 #undef APPLY_KEYINGFLAG_OVERRIDE
 
 	return result;
@@ -966,11 +966,11 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 	const char *groupname = NULL;
 	short kflag = 0, success = 0;
 	char keytype = scene->toolsettings->keyframe_type;
-	
+
 	/* sanity checks */
 	if (ks == NULL)
 		return 0;
-	
+
 	/* get flags to use */
 	if (mode == MODIFYKEY_MODE_INSERT) {
 		/* use context settings as base */
@@ -978,20 +978,20 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 	}
 	else if (mode == MODIFYKEY_MODE_DELETE)
 		kflag = 0;
-	
+
 	/* if relative Keying Sets, poll and build up the paths */
 	success = ANIM_validate_keyingset(C, dsources, ks);
-	
+
 	if (success != 0) {
 		/* return error code if failed */
 		return success;
 	}
-	
+
 	/* apply the paths as specified in the KeyingSet now */
 	for (ksp = ks->paths.first; ksp; ksp = ksp->next) {
 		int arraylen, i;
 		short kflag2;
-		
+
 		/* skip path if no ID pointer is specified */
 		if (ksp->id == NULL) {
 			BKE_reportf(reports, RPT_WARNING,
@@ -999,10 +999,10 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 			            ks->name, ksp->rna_path, ksp->array_index);
 			continue;
 		}
-		
+
 		/* since keying settings can be defined on the paths too, apply the settings for this path first */
 		kflag2 = keyingset_apply_keying_flags(kflag, ksp->keyingoverride, ksp->keyingflag);
-		
+
 		/* get pointer to name of group to add channels to */
 		if (ksp->groupmode == KSP_GROUP_NONE)
 			groupname = NULL;
@@ -1010,30 +1010,30 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 			groupname = ks->name;
 		else
 			groupname = ksp->group;
-		
+
 		/* init arraylen and i - arraylen should be greater than i so that
 		 * normal non-array entries get keyframed correctly
 		 */
 		i = ksp->array_index;
 		arraylen = i;
-		
+
 		/* get length of array if whole array option is enabled */
 		if (ksp->flag & KSP_FLAG_WHOLE_ARRAY) {
 			PointerRNA id_ptr, ptr;
 			PropertyRNA *prop;
-			
+
 			RNA_id_pointer_create(ksp->id, &id_ptr);
 			if (RNA_path_resolve_property(&id_ptr, ksp->rna_path, &ptr, &prop)) {
 				arraylen = RNA_property_array_length(&ptr, prop);
 				i = 0;  /* start from start of array, instead of the previously specified index - T48020 */
 			}
 		}
-		
+
 		/* we should do at least one step */
 		if (arraylen == i)
 			arraylen++;
-		
-		/* for each possible index, perform operation 
+
+		/* for each possible index, perform operation
 		 *	- assume that arraylen is greater than index
 		 */
 		for (; i < arraylen; i++) {
@@ -1043,13 +1043,13 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 			else if (mode == MODIFYKEY_MODE_DELETE)
 				success += delete_keyframe(reports, ksp->id, act, groupname, ksp->rna_path, i, cfra, kflag2);
 		}
-		
+
 		/* set recalc-flags */
 		switch (GS(ksp->id->name)) {
 			case ID_OB: /* Object (or Object-Related) Keyframes */
 			{
 				Object *ob = (Object *)ksp->id;
-				
+
 				// XXX: only object transforms?
 				DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 				break;
@@ -1058,11 +1058,11 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 				DEG_id_tag_update(ksp->id, DEG_TAG_COPY_ON_WRITE);
 				break;
 		}
-		
+
 		/* send notifiers for updates (this doesn't require context to work!) */
 		WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_ADDED, NULL);
 	}
-	
+
 	/* return the number of channels successfully affected */
 	return success;
 }