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

1 files changed, 668 insertions, 595 deletions

diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 7d86c42c561..36e9fde9a7a 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -40,704 +40,777 @@
 
 #include "WM_types.h"
 
-
 #ifdef RNA_RUNTIME
 
-#include "BLI_math_base.h"
+#  include "BLI_math_base.h"
 
-#include "BKE_fcurve.h"
+#  include "BKE_fcurve.h"
 
-#include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.h"
 
-#include "ED_keyframing.h"
+#  include "ED_keyframing.h"
 
-#include "WM_api.h"
+#  include "WM_api.h"
 
 static void rna_ActionGroup_channels_next(CollectionPropertyIterator *iter)
 {
-	ListBaseIterator *internal = &iter->internal.listbase;
-	FCurve *fcu = (FCurve *)internal->link;
-	bActionGroup *grp = fcu->grp;
+  ListBaseIterator *internal = &iter->internal.listbase;
+  FCurve *fcu = (FCurve *)internal->link;
+  bActionGroup *grp = fcu->grp;
 
-	/* only continue if the next F-Curve (if existent) belongs in the same group */
-	if ((fcu->next) && (fcu->next->grp == grp))
-		internal->link = (Link *)fcu->next;
-	else
-		internal->link = NULL;
+  /* only continue if the next F-Curve (if existent) belongs in the same group */
+  if ((fcu->next) && (fcu->next->grp == grp))
+    internal->link = (Link *)fcu->next;
+  else
+    internal->link = NULL;
 
-	iter->valid = (internal->link != NULL);
+  iter->valid = (internal->link != NULL);
 }
 
 static bActionGroup *rna_Action_groups_new(bAction *act, const char name[])
 {
-	return action_groups_add_new(act, name);
+  return action_groups_add_new(act, name);
 }
 
 static void rna_Action_groups_remove(bAction *act, ReportList *reports, PointerRNA *agrp_ptr)
 {
-	bActionGroup *agrp = agrp_ptr->data;
-	FCurve *fcu, *fcn;
-
-	/* try to remove the F-Curve from the action */
-	if (BLI_remlink_safe(&act->groups, agrp) == false) {
-		BKE_reportf(reports, RPT_ERROR, "Action group '%s' not found in action '%s'", agrp->name, act->id.name + 2);
-		return;
-	}
-
-	/* move every one one of the group's F-Curves out into the Action again */
-	for (fcu = agrp->channels.first; (fcu) && (fcu->grp == agrp); fcu = fcn) {
-		fcn = fcu->next;
-
-		/* remove from group */
-		action_groups_remove_channel(act, fcu);
-
-		/* tack onto the end */
-		BLI_addtail(&act->curves, fcu);
-	}
-
-	MEM_freeN(agrp);
-	RNA_POINTER_INVALIDATE(agrp_ptr);
-
-	DEG_id_tag_update(&act->id, ID_RECALC_ANIMATION_NO_FLUSH);
-	WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
+  bActionGroup *agrp = agrp_ptr->data;
+  FCurve *fcu, *fcn;
+
+  /* try to remove the F-Curve from the action */
+  if (BLI_remlink_safe(&act->groups, agrp) == false) {
+    BKE_reportf(reports,
+                RPT_ERROR,
+                "Action group '%s' not found in action '%s'",
+                agrp->name,
+                act->id.name + 2);
+    return;
+  }
+
+  /* move every one one of the group's F-Curves out into the Action again */
+  for (fcu = agrp->channels.first; (fcu) && (fcu->grp == agrp); fcu = fcn) {
+    fcn = fcu->next;
+
+    /* remove from group */
+    action_groups_remove_channel(act, fcu);
+
+    /* tack onto the end */
+    BLI_addtail(&act->curves, fcu);
+  }
+
+  MEM_freeN(agrp);
+  RNA_POINTER_INVALIDATE(agrp_ptr);
+
+  DEG_id_tag_update(&act->id, ID_RECALC_ANIMATION_NO_FLUSH);
+  WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 }
 
-static FCurve *rna_Action_fcurve_new(bAction *act, Main *bmain, ReportList *reports, const char *data_path,
-                                     int index, const char *group)
+static FCurve *rna_Action_fcurve_new(bAction *act,
+                                     Main *bmain,
+                                     ReportList *reports,
+                                     const char *data_path,
+                                     int index,
+                                     const char *group)
 {
-	if (group && group[0] == '\0') group = NULL;
-
-	if (data_path[0] == '\0') {
-		BKE_report(reports, RPT_ERROR, "F-Curve data path empty, invalid argument");
-		return NULL;
-	}
-
-	/* annoying, check if this exists */
-	if (verify_fcurve(bmain, act, group, NULL, data_path, index, 0)) {
-		BKE_reportf(reports, RPT_ERROR, "F-Curve '%s[%d]' already exists in action '%s'", data_path,
-		            index, act->id.name + 2);
-		return NULL;
-	}
-	return verify_fcurve(bmain, act, group, NULL, data_path, index, 1);
+  if (group && group[0] == '\0')
+    group = NULL;
+
+  if (data_path[0] == '\0') {
+    BKE_report(reports, RPT_ERROR, "F-Curve data path empty, invalid argument");
+    return NULL;
+  }
+
+  /* annoying, check if this exists */
+  if (verify_fcurve(bmain, act, group, NULL, data_path, index, 0)) {
+    BKE_reportf(reports,
+                RPT_ERROR,
+                "F-Curve '%s[%d]' already exists in action '%s'",
+                data_path,
+                index,
+                act->id.name + 2);
+    return NULL;
+  }
+  return verify_fcurve(bmain, act, group, NULL, data_path, index, 1);
 }
 
-static FCurve *rna_Action_fcurve_find(bAction *act, ReportList *reports, const char *data_path, int index)
+static FCurve *rna_Action_fcurve_find(bAction *act,
+                                      ReportList *reports,
+                                      const char *data_path,
+                                      int index)
 {
-	if (data_path[0] == '\0') {
-		BKE_report(reports, RPT_ERROR, "F-Curve data path empty, invalid argument");
-		return NULL;
-	}
+  if (data_path[0] == '\0') {
+    BKE_report(reports, RPT_ERROR, "F-Curve data path empty, invalid argument");
+    return NULL;
+  }
 
-	/* Returns NULL if not found. */
-	return list_find_fcurve(&act->curves, data_path, index);
+  /* Returns NULL if not found. */
+  return list_find_fcurve(&act->curves, data_path, index);
 }
 
 static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerRNA *fcu_ptr)
 {
-	FCurve *fcu = fcu_ptr->data;
-	if (fcu->grp) {
-		if (BLI_findindex(&act->groups, fcu->grp) == -1) {
-			BKE_reportf(reports, RPT_ERROR, "F-Curve's action group '%s' not found in action '%s'",
-			            fcu->grp->name, act->id.name + 2);
-			return;
-		}
-
-		action_groups_remove_channel(act, fcu);
-		free_fcurve(fcu);
-		RNA_POINTER_INVALIDATE(fcu_ptr);
-	}
-	else {
-		if (BLI_findindex(&act->curves, fcu) == -1) {
-			BKE_reportf(reports, RPT_ERROR, "F-Curve not found in action '%s'", act->id.name + 2);
-			return;
-		}
-
-		BLI_remlink(&act->curves, fcu);
-		free_fcurve(fcu);
-		RNA_POINTER_INVALIDATE(fcu_ptr);
-	}
-
-	DEG_id_tag_update(&act->id, ID_RECALC_ANIMATION_NO_FLUSH);
-	WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
+  FCurve *fcu = fcu_ptr->data;
+  if (fcu->grp) {
+    if (BLI_findindex(&act->groups, fcu->grp) == -1) {
+      BKE_reportf(reports,
+                  RPT_ERROR,
+                  "F-Curve's action group '%s' not found in action '%s'",
+                  fcu->grp->name,
+                  act->id.name + 2);
+      return;
+    }
+
+    action_groups_remove_channel(act, fcu);
+    free_fcurve(fcu);
+    RNA_POINTER_INVALIDATE(fcu_ptr);
+  }
+  else {
+    if (BLI_findindex(&act->curves, fcu) == -1) {
+      BKE_reportf(reports, RPT_ERROR, "F-Curve not found in action '%s'", act->id.name + 2);
+      return;
+    }
+
+    BLI_remlink(&act->curves, fcu);
+    free_fcurve(fcu);
+    RNA_POINTER_INVALIDATE(fcu_ptr);
+  }
+
+  DEG_id_tag_update(&act->id, ID_RECALC_ANIMATION_NO_FLUSH);
+  WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 }
 
 static TimeMarker *rna_Action_pose_markers_new(bAction *act, const char name[])
 {
-	TimeMarker *marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
-	marker->flag = 1;
-	marker->frame = 1;
-	BLI_strncpy_utf8(marker->name, name, sizeof(marker->name));
-	BLI_addtail(&act->markers, marker);
-	return marker;
+  TimeMarker *marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
+  marker->flag = 1;
+  marker->frame = 1;
+  BLI_strncpy_utf8(marker->name, name, sizeof(marker->name));
+  BLI_addtail(&act->markers, marker);
+  return marker;
 }
 
-static void rna_Action_pose_markers_remove(bAction *act, ReportList *reports, PointerRNA *marker_ptr)
+static void rna_Action_pose_markers_remove(bAction *act,
+                                           ReportList *reports,
+                                           PointerRNA *marker_ptr)
 {
-	TimeMarker *marker = marker_ptr->data;
-	if (!BLI_remlink_safe(&act->markers, marker)) {
-		BKE_reportf(reports, RPT_ERROR, "Timeline marker '%s' not found in action '%s'", marker->name, act->id.name + 2);
-		return;
-	}
-
-	MEM_freeN(marker);
-	RNA_POINTER_INVALIDATE(marker_ptr);
+  TimeMarker *marker = marker_ptr->data;
+  if (!BLI_remlink_safe(&act->markers, marker)) {
+    BKE_reportf(reports,
+                RPT_ERROR,
+                "Timeline marker '%s' not found in action '%s'",
+                marker->name,
+                act->id.name + 2);
+    return;
+  }
+
+  MEM_freeN(marker);
+  RNA_POINTER_INVALIDATE(marker_ptr);
 }
 
 static PointerRNA rna_Action_active_pose_marker_get(PointerRNA *ptr)
 {
-	bAction *act = (bAction *)ptr->data;
-	return rna_pointer_inherit_refine(ptr, &RNA_TimelineMarker, BLI_findlink(&act->markers, act->active_marker - 1));
+  bAction *act = (bAction *)ptr->data;
+  return rna_pointer_inherit_refine(
+      ptr, &RNA_TimelineMarker, BLI_findlink(&act->markers, act->active_marker - 1));
 }
 
 static void rna_Action_active_pose_marker_set(PointerRNA *ptr, PointerRNA value)
 {
-	bAction *act = (bAction *)ptr->data;
-	act->active_marker = BLI_findindex(&act->markers, value.data) + 1;
+  bAction *act = (bAction *)ptr->data;
+  act->active_marker = BLI_findindex(&act->markers, value.data) + 1;
 }
 
 static int rna_Action_active_pose_marker_index_get(PointerRNA *ptr)
 {
-	bAction *act = (bAction *)ptr->data;
-	return MAX2(act->active_marker - 1, 0);
+  bAction *act = (bAction *)ptr->data;
+  return MAX2(act->active_marker - 1, 0);
 }
 
 static void rna_Action_active_pose_marker_index_set(PointerRNA *ptr, int value)
 {
-	bAction *act = (bAction *)ptr->data;
-	act->active_marker = value + 1;
+  bAction *act = (bAction *)ptr->data;
+  act->active_marker = value + 1;
 }
 
-static void rna_Action_active_pose_marker_index_range(PointerRNA *ptr, int *min, int *max,
-                                                      int *UNUSED(softmin), int *UNUSED(softmax))
+static void rna_Action_active_pose_marker_index_range(
+    PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
 {
-	bAction *act = (bAction *)ptr->data;
+  bAction *act = (bAction *)ptr->data;
 
-	*min = 0;
-	*max = max_ii(0, BLI_listbase_count(&act->markers) - 1);
+  *min = 0;
+  *max = max_ii(0, BLI_listbase_count(&act->markers) - 1);
 }
 
-
-
 static void rna_Action_frame_range_get(PointerRNA *ptr, float *values)
-{   /* don't include modifiers because they too easily can have very large
-	 * ranges: MINAFRAMEF to MAXFRAMEF. */
-	calc_action_range(ptr->id.data, values, values + 1, false);
+{ /* don't include modifiers because they too easily can have very large
+   * ranges: MINAFRAMEF to MAXFRAMEF. */
+  calc_action_range(ptr->id.data, values, values + 1, false);
 }
 
-
 /* used to check if an action (value pointer) is suitable to be assigned to the ID-block that is ptr */
 bool rna_Action_id_poll(PointerRNA *ptr, PointerRNA value)
 {
-	ID *srcId = (ID *)ptr->id.data;
-	bAction *act = (bAction *)value.id.data;
-
-	if (act) {
-		/* there can still be actions that will have undefined id-root
-		 * (i.e. floating "action-library" members) which we will not
-		 * be able to resolve an idroot for automatically, so let these through
-		 */
-		if (act->idroot == 0)
-			return 1;
-		else if (srcId)
-			return GS(srcId->name) == act->idroot;
-	}
-
-	return 0;
+  ID *srcId = (ID *)ptr->id.data;
+  bAction *act = (bAction *)value.id.data;
+
+  if (act) {
+    /* there can still be actions that will have undefined id-root
+     * (i.e. floating "action-library" members) which we will not
+     * be able to resolve an idroot for automatically, so let these through
+     */
+    if (act->idroot == 0)
+      return 1;
+    else if (srcId)
+      return GS(srcId->name) == act->idroot;
+  }
+
+  return 0;
 }
 
 /* used to check if an action (value pointer) can be assigned to Action Editor given current mode */
 bool rna_Action_actedit_assign_poll(PointerRNA *ptr, PointerRNA value)
 {
-	SpaceAction *saction = (SpaceAction *)ptr->data;
-	bAction *act = (bAction *)value.id.data;
-
-	if (act) {
-		/* there can still be actions that will have undefined id-root
-		 * (i.e. floating "action-library" members) which we will not
-		 * be able to resolve an idroot for automatically, so let these through
-		 */
-		if (act->idroot == 0)
-			return 1;
-
-		if (saction) {
-			if (saction->mode == SACTCONT_ACTION) {
-				/* this is only Object-level for now... */
-				return act->idroot == ID_OB;
-			}
-			else if (saction->mode == SACTCONT_SHAPEKEY) {
-				/* obviously shapekeys only */
-				return act->idroot == ID_KE;
-			}
-		}
-	}
-
-	return 0;
+  SpaceAction *saction = (SpaceAction *)ptr->data;
+  bAction *act = (bAction *)value.id.data;
+
+  if (act) {
+    /* there can still be actions that will have undefined id-root
+     * (i.e. floating "action-library" members) which we will not
+     * be able to resolve an idroot for automatically, so let these through
+     */
+    if (act->idroot == 0)
+      return 1;
+
+    if (saction) {
+      if (saction->mode == SACTCONT_ACTION) {
+        /* this is only Object-level for now... */
+        return act->idroot == ID_OB;
+      }
+      else if (saction->mode == SACTCONT_SHAPEKEY) {
+        /* obviously shapekeys only */
+        return act->idroot == ID_KE;
+      }
+    }
+  }
+
+  return 0;
 }
 
 #else
 
 static void rna_def_dopesheet(BlenderRNA *brna)
 {
-	StructRNA *srna;
-	PropertyRNA *prop;
-
-	srna = RNA_def_struct(brna, "DopeSheet", NULL);
-	RNA_def_struct_sdna(srna, "bDopeSheet");
-	RNA_def_struct_ui_text(srna, "Dope Sheet", "Settings for filtering the channels shown in animation editors");
-
-	/* Source of DopeSheet data */
-	/* XXX: make this obsolete? */
-	prop = RNA_def_property(srna, "source", PROP_POINTER, PROP_NONE);
-	RNA_def_property_struct_type(prop, "ID");
-	RNA_def_property_ui_text(prop, "Source",
-	                         "ID-Block representing source data, usually ID_SCE (i.e. Scene)");
-
-	/* Show data-block filters */
-	prop = RNA_def_property(srna, "show_datablock_filters", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SHOW_DBFILTERS);
-	RNA_def_property_ui_text(prop, "Show Datablock Filters",
-	                         "Show options for whether channels related to certain types of data are included");
-	RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN, NULL);
-
-	/* General Filtering Settings */
-	prop = RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYSEL);
-	RNA_def_property_ui_text(prop, "Only Selected", "Only include channels relating to selected objects and data");
-	RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_INCL_HIDDEN);
-	RNA_def_property_ui_text(prop, "Display Hidden", "Include channels from objects/bone that are not visible");
-	RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "use_datablock_sort", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_NO_DB_SORT);
-	RNA_def_property_ui_text(prop, "Sort Data-Blocks",
-	                         "Alphabetically sorts data-blocks - mainly objects in the scene "
-	                         "(disable to increase viewport speed)");
-	RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* Debug Filtering Settings */
-	prop = RNA_def_property(srna, "show_only_errors", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLY_ERRORS);
-	RNA_def_property_ui_text(prop, "Show Errors", "Only include F-Curves and drivers that are disabled or have errors");
-	RNA_def_property_ui_icon(prop, ICON_ERROR, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* Object Collection Filtering Settings */
-	prop = RNA_def_property(srna, "filter_collection", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "filter_grp");
-	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Filtering Collection", "Collection that included object should be a member of");
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* FCurve Display Name Search Settings */
-	prop = RNA_def_property(srna, "filter_fcurve_name", PROP_STRING, PROP_NONE);
-	RNA_def_property_string_sdna(prop, NULL, "searchstr");
-	RNA_def_property_ui_text(prop, "F-Curve Name Filter", "F-Curve live filtering string");
-	RNA_def_property_ui_icon(prop, ICON_VIEWZOOM, 0);
-	RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* NLA Name Search Settings (Shared with FCurve setting, but with different labels) */
-	prop = RNA_def_property(srna, "filter_text", PROP_STRING, PROP_NONE);
-	RNA_def_property_string_sdna(prop, NULL, "searchstr");
-	RNA_def_property_ui_text(prop, "Name Filter", "Live filtering string");
-	RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
-	RNA_def_property_ui_icon(prop, ICON_VIEWZOOM, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* Multi-word fuzzy search option for name/text filters */
-	prop = RNA_def_property(srna, "use_multi_word_filter", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_FUZZY_NAMES);
-	RNA_def_property_ui_text(prop, "Multi-Word Fuzzy Filter",
-	                         "Perform fuzzy/multi-word matching (WARNING: May be slow)");
-	RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* NLA Specific Settings */
-	prop = RNA_def_property(srna, "show_missing_nla", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT);
-	RNA_def_property_ui_text(prop, "Include Missing NLA",
-	                         "Include animation data-blocks with no NLA data (NLA editor only)");
-	RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* Summary Settings (DopeSheet editors only) */
-	prop = RNA_def_property(srna, "show_summary", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY);
-	RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line (Dope Sheet editors only)");
-	RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_expanded_summary", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED);
-	RNA_def_property_ui_text(prop, "Collapse Summary",
-	                         "Collapse summary when shown, so all other channels get hidden (Dope Sheet editors only)");
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-
-	/* General DataType Filtering Settings */
-	prop = RNA_def_property(srna, "show_transforms", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOOBJ);
-	RNA_def_property_ui_text(prop, "Display Transforms",
-	                         "Include visualization of object-level animation data (mostly transforms)");
-	RNA_def_property_ui_icon(prop, ICON_ORIENTATION_GLOBAL, 0); /* XXX? */
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_shapekeys", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSHAPEKEYS);
-	RNA_def_property_ui_text(prop, "Display Shapekeys", "Include visualization of shape key related animation data");
-	RNA_def_property_ui_icon(prop, ICON_SHAPEKEY_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_modifiers", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMODIFIERS);
-	RNA_def_property_ui_text(prop, "Display Modifier Data",
-	                         "Include visualization of animation data related to data-blocks linked to modifiers");
-	RNA_def_property_ui_icon(prop, ICON_MODIFIER_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_meshes", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMESH);
-	RNA_def_property_ui_text(prop, "Display Meshes", "Include visualization of mesh related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_MESH, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_lattices", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAT);
-	RNA_def_property_ui_text(prop, "Display Lattices", "Include visualization of lattice related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_LATTICE, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_cameras", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCAM);
-	RNA_def_property_ui_text(prop, "Display Camera", "Include visualization of camera related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_CAMERA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_materials", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMAT);
-	RNA_def_property_ui_text(prop, "Display Material", "Include visualization of material related animation data");
-	RNA_def_property_ui_icon(prop, ICON_MATERIAL_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_lights", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAM);
-	RNA_def_property_ui_text(prop, "Display Light", "Include visualization of light related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_LIGHT, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_linestyles", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLINESTYLE);
-	RNA_def_property_ui_text(prop, "Display Line Style", "Include visualization of Line Style related Animation data");
-	RNA_def_property_ui_icon(prop, ICON_LINE_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_textures", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOTEX);
-	RNA_def_property_ui_text(prop, "Display Texture", "Include visualization of texture related animation data");
-	RNA_def_property_ui_icon(prop, ICON_TEXTURE_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_curves", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCUR);
-	RNA_def_property_ui_text(prop, "Display Curve", "Include visualization of curve related animation data");
-	RNA_def_property_ui_icon(prop, ICON_CURVE_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_worlds", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOWOR);
-	RNA_def_property_ui_text(prop, "Display World", "Include visualization of world related animation data");
-	RNA_def_property_ui_icon(prop, ICON_WORLD_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_scenes", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSCE);
-	RNA_def_property_ui_text(prop, "Display Scene", "Include visualization of scene related animation data");
-	RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_particles", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOPART);
-	RNA_def_property_ui_text(prop, "Display Particle", "Include visualization of particle related animation data");
-	RNA_def_property_ui_icon(prop, ICON_PARTICLE_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_metaballs", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMBA);
-	RNA_def_property_ui_text(prop, "Display Metaball", "Include visualization of metaball related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_META, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_armatures", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOARM);
-	RNA_def_property_ui_text(prop, "Display Armature", "Include visualization of armature related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_ARMATURE, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_nodes", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NONTREE);
-	RNA_def_property_ui_text(prop, "Display Node", "Include visualization of node related animation data");
-	RNA_def_property_ui_icon(prop, ICON_NODETREE, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_speakers", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSPK);
-	RNA_def_property_ui_text(prop, "Display Speaker", "Include visualization of speaker related animation data");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_SPEAKER, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_cache_files", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag2", ADS_FILTER_NOCACHEFILES);
-	RNA_def_property_ui_text(prop, "Display Cache Files", "Include visualization of cache file related animation data");
-	RNA_def_property_ui_icon(prop, ICON_FILE, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_gpencil", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOGPENCIL);
-	RNA_def_property_ui_text(prop, "Display Grease Pencil", "Include visualization of Grease Pencil related animation data and frames");
-	RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_GREASEPENCIL, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* GPencil Mode Settings */
-	prop = RNA_def_property(srna, "show_gpencil_3d_only", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_GP_3DONLY);
-	RNA_def_property_ui_text(prop, "Active Scene Only",
-	                         "Only show Grease Pencil data-blocks used as part of the active scene");
-	RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+  StructRNA *srna;
+  PropertyRNA *prop;
+
+  srna = RNA_def_struct(brna, "DopeSheet", NULL);
+  RNA_def_struct_sdna(srna, "bDopeSheet");
+  RNA_def_struct_ui_text(
+      srna, "Dope Sheet", "Settings for filtering the channels shown in animation editors");
+
+  /* Source of DopeSheet data */
+  /* XXX: make this obsolete? */
+  prop = RNA_def_property(srna, "source", PROP_POINTER, PROP_NONE);
+  RNA_def_property_struct_type(prop, "ID");
+  RNA_def_property_ui_text(
+      prop, "Source", "ID-Block representing source data, usually ID_SCE (i.e. Scene)");
+
+  /* Show data-block filters */
+  prop = RNA_def_property(srna, "show_datablock_filters", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SHOW_DBFILTERS);
+  RNA_def_property_ui_text(
+      prop,
+      "Show Datablock Filters",
+      "Show options for whether channels related to certain types of data are included");
+  RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN, NULL);
+
+  /* General Filtering Settings */
+  prop = RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYSEL);
+  RNA_def_property_ui_text(
+      prop, "Only Selected", "Only include channels relating to selected objects and data");
+  RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_INCL_HIDDEN);
+  RNA_def_property_ui_text(
+      prop, "Display Hidden", "Include channels from objects/bone that are not visible");
+  RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "use_datablock_sort", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_NO_DB_SORT);
+  RNA_def_property_ui_text(prop,
+                           "Sort Data-Blocks",
+                           "Alphabetically sorts data-blocks - mainly objects in the scene "
+                           "(disable to increase viewport speed)");
+  RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* Debug Filtering Settings */
+  prop = RNA_def_property(srna, "show_only_errors", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLY_ERRORS);
+  RNA_def_property_ui_text(
+      prop, "Show Errors", "Only include F-Curves and drivers that are disabled or have errors");
+  RNA_def_property_ui_icon(prop, ICON_ERROR, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* Object Collection Filtering Settings */
+  prop = RNA_def_property(srna, "filter_collection", PROP_POINTER, PROP_NONE);
+  RNA_def_property_pointer_sdna(prop, NULL, "filter_grp");
+  RNA_def_property_flag(prop, PROP_EDITABLE);
+  RNA_def_property_ui_text(
+      prop, "Filtering Collection", "Collection that included object should be a member of");
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* FCurve Display Name Search Settings */
+  prop = RNA_def_property(srna, "filter_fcurve_name", PROP_STRING, PROP_NONE);
+  RNA_def_property_string_sdna(prop, NULL, "searchstr");
+  RNA_def_property_ui_text(prop, "F-Curve Name Filter", "F-Curve live filtering string");
+  RNA_def_property_ui_icon(prop, ICON_VIEWZOOM, 0);
+  RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* NLA Name Search Settings (Shared with FCurve setting, but with different labels) */
+  prop = RNA_def_property(srna, "filter_text", PROP_STRING, PROP_NONE);
+  RNA_def_property_string_sdna(prop, NULL, "searchstr");
+  RNA_def_property_ui_text(prop, "Name Filter", "Live filtering string");
+  RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
+  RNA_def_property_ui_icon(prop, ICON_VIEWZOOM, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* Multi-word fuzzy search option for name/text filters */
+  prop = RNA_def_property(srna, "use_multi_word_filter", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_FUZZY_NAMES);
+  RNA_def_property_ui_text(
+      prop, "Multi-Word Fuzzy Filter", "Perform fuzzy/multi-word matching (WARNING: May be slow)");
+  RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* NLA Specific Settings */
+  prop = RNA_def_property(srna, "show_missing_nla", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT);
+  RNA_def_property_ui_text(prop,
+                           "Include Missing NLA",
+                           "Include animation data-blocks with no NLA data (NLA editor only)");
+  RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* Summary Settings (DopeSheet editors only) */
+  prop = RNA_def_property(srna, "show_summary", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY);
+  RNA_def_property_ui_text(
+      prop, "Display Summary", "Display an additional 'summary' line (Dope Sheet editors only)");
+  RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_expanded_summary", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED);
+  RNA_def_property_ui_text(
+      prop,
+      "Collapse Summary",
+      "Collapse summary when shown, so all other channels get hidden (Dope Sheet editors only)");
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* General DataType Filtering Settings */
+  prop = RNA_def_property(srna, "show_transforms", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOOBJ);
+  RNA_def_property_ui_text(
+      prop,
+      "Display Transforms",
+      "Include visualization of object-level animation data (mostly transforms)");
+  RNA_def_property_ui_icon(prop, ICON_ORIENTATION_GLOBAL, 0); /* XXX? */
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_shapekeys", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSHAPEKEYS);
+  RNA_def_property_ui_text(
+      prop, "Display Shapekeys", "Include visualization of shape key related animation data");
+  RNA_def_property_ui_icon(prop, ICON_SHAPEKEY_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_modifiers", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMODIFIERS);
+  RNA_def_property_ui_text(
+      prop,
+      "Display Modifier Data",
+      "Include visualization of animation data related to data-blocks linked to modifiers");
+  RNA_def_property_ui_icon(prop, ICON_MODIFIER_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_meshes", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMESH);
+  RNA_def_property_ui_text(
+      prop, "Display Meshes", "Include visualization of mesh related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_MESH, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_lattices", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAT);
+  RNA_def_property_ui_text(
+      prop, "Display Lattices", "Include visualization of lattice related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_LATTICE, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_cameras", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCAM);
+  RNA_def_property_ui_text(
+      prop, "Display Camera", "Include visualization of camera related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_CAMERA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_materials", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMAT);
+  RNA_def_property_ui_text(
+      prop, "Display Material", "Include visualization of material related animation data");
+  RNA_def_property_ui_icon(prop, ICON_MATERIAL_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_lights", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAM);
+  RNA_def_property_ui_text(
+      prop, "Display Light", "Include visualization of light related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_LIGHT, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_linestyles", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLINESTYLE);
+  RNA_def_property_ui_text(
+      prop, "Display Line Style", "Include visualization of Line Style related Animation data");
+  RNA_def_property_ui_icon(prop, ICON_LINE_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_textures", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOTEX);
+  RNA_def_property_ui_text(
+      prop, "Display Texture", "Include visualization of texture related animation data");
+  RNA_def_property_ui_icon(prop, ICON_TEXTURE_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_curves", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCUR);
+  RNA_def_property_ui_text(
+      prop, "Display Curve", "Include visualization of curve related animation data");
+  RNA_def_property_ui_icon(prop, ICON_CURVE_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_worlds", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOWOR);
+  RNA_def_property_ui_text(
+      prop, "Display World", "Include visualization of world related animation data");
+  RNA_def_property_ui_icon(prop, ICON_WORLD_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_scenes", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSCE);
+  RNA_def_property_ui_text(
+      prop, "Display Scene", "Include visualization of scene related animation data");
+  RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_particles", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOPART);
+  RNA_def_property_ui_text(
+      prop, "Display Particle", "Include visualization of particle related animation data");
+  RNA_def_property_ui_icon(prop, ICON_PARTICLE_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_metaballs", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMBA);
+  RNA_def_property_ui_text(
+      prop, "Display Metaball", "Include visualization of metaball related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_META, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_armatures", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOARM);
+  RNA_def_property_ui_text(
+      prop, "Display Armature", "Include visualization of armature related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_ARMATURE, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_nodes", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NONTREE);
+  RNA_def_property_ui_text(
+      prop, "Display Node", "Include visualization of node related animation data");
+  RNA_def_property_ui_icon(prop, ICON_NODETREE, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_speakers", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSPK);
+  RNA_def_property_ui_text(
+      prop, "Display Speaker", "Include visualization of speaker related animation data");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_SPEAKER, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_cache_files", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag2", ADS_FILTER_NOCACHEFILES);
+  RNA_def_property_ui_text(
+      prop, "Display Cache Files", "Include visualization of cache file related animation data");
+  RNA_def_property_ui_icon(prop, ICON_FILE, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_gpencil", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOGPENCIL);
+  RNA_def_property_ui_text(
+      prop,
+      "Display Grease Pencil",
+      "Include visualization of Grease Pencil related animation data and frames");
+  RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_GREASEPENCIL, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* GPencil Mode Settings */
+  prop = RNA_def_property(srna, "show_gpencil_3d_only", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_GP_3DONLY);
+  RNA_def_property_ui_text(prop,
+                           "Active Scene Only",
+                           "Only show Grease Pencil data-blocks used as part of the active scene");
+  RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 }
 
 static void rna_def_action_group(BlenderRNA *brna)
 {
-	StructRNA *srna;
-	PropertyRNA *prop;
-
-	srna = RNA_def_struct(brna, "ActionGroup", NULL);
-	RNA_def_struct_sdna(srna, "bActionGroup");
-	RNA_def_struct_ui_text(srna, "Action Group", "Groups of F-Curves");
-
-	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
-	RNA_def_property_ui_text(prop, "Name", "");
-	RNA_def_struct_name_property(srna, prop);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* WARNING: be very careful when working with this list, since the endpoint is not
-	 * defined like a standard ListBase. Adding/removing channels from this list needs
-	 * extreme care, otherwise the F-Curve list running through adjacent groups does
-	 * not match up with the one stored in the Action, resulting in curves which do not
-	 * show up in animation editors. In extreme cases, animation may also selectively
-	 * fail to play back correctly.
-	 *
-	 * If such changes are required, these MUST go through the API functions for manipulating
-	 * these F-Curve groupings. Also, note that groups only apply in actions ONLY.
-	 */
-	prop = RNA_def_property(srna, "channels", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_collection_sdna(prop, NULL, "channels", NULL);
-	RNA_def_property_struct_type(prop, "FCurve");
-	RNA_def_property_collection_funcs(prop, NULL, "rna_ActionGroup_channels_next", NULL, NULL, NULL, NULL, NULL, NULL);
-	RNA_def_property_ui_text(prop, "Channels", "F-Curves in this group");
-
-	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED);
-	RNA_def_property_ui_text(prop, "Select", "Action group is selected");
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
-
-	prop = RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED);
-	RNA_def_property_ui_text(prop, "Lock", "Action group is locked");
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_flag(prop, PROP_NO_DEG_UPDATE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_EXPANDED);
-	RNA_def_property_ui_text(prop, "Expanded", "Action group is expanded");
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-
-	/* color set */
-	rna_def_actionbone_group_common(srna, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+  StructRNA *srna;
+  PropertyRNA *prop;
+
+  srna = RNA_def_struct(brna, "ActionGroup", NULL);
+  RNA_def_struct_sdna(srna, "bActionGroup");
+  RNA_def_struct_ui_text(srna, "Action Group", "Groups of F-Curves");
+
+  prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+  RNA_def_property_ui_text(prop, "Name", "");
+  RNA_def_struct_name_property(srna, prop);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* WARNING: be very careful when working with this list, since the endpoint is not
+   * defined like a standard ListBase. Adding/removing channels from this list needs
+   * extreme care, otherwise the F-Curve list running through adjacent groups does
+   * not match up with the one stored in the Action, resulting in curves which do not
+   * show up in animation editors. In extreme cases, animation may also selectively
+   * fail to play back correctly.
+   *
+   * If such changes are required, these MUST go through the API functions for manipulating
+   * these F-Curve groupings. Also, note that groups only apply in actions ONLY.
+   */
+  prop = RNA_def_property(srna, "channels", PROP_COLLECTION, PROP_NONE);
+  RNA_def_property_collection_sdna(prop, NULL, "channels", NULL);
+  RNA_def_property_struct_type(prop, "FCurve");
+  RNA_def_property_collection_funcs(
+      prop, NULL, "rna_ActionGroup_channels_next", NULL, NULL, NULL, NULL, NULL, NULL);
+  RNA_def_property_ui_text(prop, "Channels", "F-Curves in this group");
+
+  prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED);
+  RNA_def_property_ui_text(prop, "Select", "Action group is selected");
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
+
+  prop = RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED);
+  RNA_def_property_ui_text(prop, "Lock", "Action group is locked");
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_flag(prop, PROP_NO_DEG_UPDATE);
+  RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_EXPANDED);
+  RNA_def_property_ui_text(prop, "Expanded", "Action group is expanded");
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
+
+  /* color set */
+  rna_def_actionbone_group_common(srna, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 }
 
 /* fcurve.keyframe_points */
 static void rna_def_action_groups(BlenderRNA *brna, PropertyRNA *cprop)
 {
-	StructRNA *srna;
-
-	FunctionRNA *func;
-	PropertyRNA *parm;
-
-	RNA_def_property_srna(cprop, "ActionGroups");
-	srna = RNA_def_struct(brna, "ActionGroups", NULL);
-	RNA_def_struct_sdna(srna, "bAction");
-	RNA_def_struct_ui_text(srna, "Action Groups", "Collection of action groups");
-
-	func = RNA_def_function(srna, "new", "rna_Action_groups_new");
-	RNA_def_function_ui_description(func, "Create a new action group and add it to the action");
-	parm = RNA_def_string(func, "name", "Group", 0, "", "New name for the action group");
-	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
-
-	parm = RNA_def_pointer(func, "action_group", "ActionGroup", "", "Newly created action group");
-	RNA_def_function_return(func, parm);
-
-
-	func = RNA_def_function(srna, "remove", "rna_Action_groups_remove");
-	RNA_def_function_ui_description(func, "Remove action group");
-	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm = RNA_def_pointer(func, "action_group", "ActionGroup", "", "Action group to remove");
-	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
-	RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
+  StructRNA *srna;
+
+  FunctionRNA *func;
+  PropertyRNA *parm;
+
+  RNA_def_property_srna(cprop, "ActionGroups");
+  srna = RNA_def_struct(brna, "ActionGroups", NULL);
+  RNA_def_struct_sdna(srna, "bAction");
+  RNA_def_struct_ui_text(srna, "Action Groups", "Collection of action groups");
+
+  func = RNA_def_function(srna, "new", "rna_Action_groups_new");
+  RNA_def_function_ui_description(func, "Create a new action group and add it to the action");
+  parm = RNA_def_string(func, "name", "Group", 0, "", "New name for the action group");
+  RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+
+  parm = RNA_def_pointer(func, "action_group", "ActionGroup", "", "Newly created action group");
+  RNA_def_function_return(func, parm);
+
+  func = RNA_def_function(srna, "remove", "rna_Action_groups_remove");
+  RNA_def_function_ui_description(func, "Remove action group");
+  RNA_def_function_flag(func, FUNC_USE_REPORTS);
+  parm = RNA_def_pointer(func, "action_group", "ActionGroup", "", "Action group to remove");
+  RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
+  RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
 }
 
 static void rna_def_action_fcurves(BlenderRNA *brna, PropertyRNA *cprop)
 {
-	StructRNA *srna;
-
-	FunctionRNA *func;
-	PropertyRNA *parm;
-
-	RNA_def_property_srna(cprop, "ActionFCurves");
-	srna = RNA_def_struct(brna, "ActionFCurves", NULL);
-	RNA_def_struct_sdna(srna, "bAction");
-	RNA_def_struct_ui_text(srna, "Action F-Curves", "Collection of action F-Curves");
-
-	/* Action.fcurves.new(...) */
-	func = RNA_def_function(srna, "new", "rna_Action_fcurve_new");
-	RNA_def_function_ui_description(func, "Add an F-Curve to the action");
-	RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_MAIN);
-	parm = RNA_def_string(func, "data_path", NULL, 0, "Data Path", "F-Curve data path to use");
-	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
-	RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX);
-	RNA_def_string(func, "action_group", NULL, 0, "Action Group", "Acton group to add this F-Curve into");
-
-	parm = RNA_def_pointer(func, "fcurve", "FCurve", "", "Newly created F-Curve");
-	RNA_def_function_return(func, parm);
-
-	/* Action.fcurves.find(...) */
-	func = RNA_def_function(srna, "find", "rna_Action_fcurve_find");
-	RNA_def_function_ui_description(func, "Find an F-Curve. Note that this function performs a linear scan "
-	                                "of all F-Curves in the action.");
-	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm = RNA_def_string(func, "data_path", NULL, 0, "Data Path", "F-Curve data path");
-	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
-	RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX);
-	parm = RNA_def_pointer(func, "fcurve", "FCurve", "", "The found F-Curve, or None if it doesn't exist");
-	RNA_def_function_return(func, parm);
-
-	/* Action.fcurves.remove(...) */
-	func = RNA_def_function(srna, "remove", "rna_Action_fcurve_remove");
-	RNA_def_function_ui_description(func, "Remove action group");
-	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm = RNA_def_pointer(func, "fcurve", "FCurve", "", "F-Curve to remove");
-	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
-	RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
+  StructRNA *srna;
+
+  FunctionRNA *func;
+  PropertyRNA *parm;
+
+  RNA_def_property_srna(cprop, "ActionFCurves");
+  srna = RNA_def_struct(brna, "ActionFCurves", NULL);
+  RNA_def_struct_sdna(srna, "bAction");
+  RNA_def_struct_ui_text(srna, "Action F-Curves", "Collection of action F-Curves");
+
+  /* Action.fcurves.new(...) */
+  func = RNA_def_function(srna, "new", "rna_Action_fcurve_new");
+  RNA_def_function_ui_description(func, "Add an F-Curve to the action");
+  RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_MAIN);
+  parm = RNA_def_string(func, "data_path", NULL, 0, "Data Path", "F-Curve data path to use");
+  RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+  RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX);
+  RNA_def_string(
+      func, "action_group", NULL, 0, "Action Group", "Acton group to add this F-Curve into");
+
+  parm = RNA_def_pointer(func, "fcurve", "FCurve", "", "Newly created F-Curve");
+  RNA_def_function_return(func, parm);
+
+  /* Action.fcurves.find(...) */
+  func = RNA_def_function(srna, "find", "rna_Action_fcurve_find");
+  RNA_def_function_ui_description(
+      func,
+      "Find an F-Curve. Note that this function performs a linear scan "
+      "of all F-Curves in the action.");
+  RNA_def_function_flag(func, FUNC_USE_REPORTS);
+  parm = RNA_def_string(func, "data_path", NULL, 0, "Data Path", "F-Curve data path");
+  RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+  RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX);
+  parm = RNA_def_pointer(
+      func, "fcurve", "FCurve", "", "The found F-Curve, or None if it doesn't exist");
+  RNA_def_function_return(func, parm);
+
+  /* Action.fcurves.remove(...) */
+  func = RNA_def_function(srna, "remove", "rna_Action_fcurve_remove");
+  RNA_def_function_ui_description(func, "Remove action group");
+  RNA_def_function_flag(func, FUNC_USE_REPORTS);
+  parm = RNA_def_pointer(func, "fcurve", "FCurve", "", "F-Curve to remove");
+  RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
+  RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
 }
 
 static void rna_def_action_pose_markers(BlenderRNA *brna, PropertyRNA *cprop)
 {
-	StructRNA *srna;
-	PropertyRNA *prop;
-
-	FunctionRNA *func;
-	PropertyRNA *parm;
-
-	RNA_def_property_srna(cprop, "ActionPoseMarkers");
-	srna = RNA_def_struct(brna, "ActionPoseMarkers", NULL);
-	RNA_def_struct_sdna(srna, "bAction");
-	RNA_def_struct_ui_text(srna, "Action Pose Markers", "Collection of timeline markers");
-
-	func = RNA_def_function(srna, "new", "rna_Action_pose_markers_new");
-	RNA_def_function_ui_description(func, "Add a pose marker to the action");
-	parm = RNA_def_string(func, "name", "Marker", 0, NULL, "New name for the marker (not unique)");
-	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
-	parm = RNA_def_pointer(func, "marker", "TimelineMarker", "", "Newly created marker");
-	RNA_def_function_return(func, parm);
-
-	func = RNA_def_function(srna, "remove", "rna_Action_pose_markers_remove");
-	RNA_def_function_ui_description(func, "Remove a timeline marker");
-	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm = RNA_def_pointer(func, "marker", "TimelineMarker", "", "Timeline marker to remove");
-	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
-	RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
-
-	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
-	RNA_def_property_struct_type(prop, "TimelineMarker");
-	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_LIB_EXCEPTION);
-	RNA_def_property_pointer_funcs(prop, "rna_Action_active_pose_marker_get",
-	                               "rna_Action_active_pose_marker_set", NULL, NULL);
-	RNA_def_property_ui_text(prop, "Active Pose Marker", "Active pose marker for this action");
-
-	prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
-	RNA_def_property_int_sdna(prop, NULL, "active_marker");
-	RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
-	RNA_def_property_int_funcs(prop, "rna_Action_active_pose_marker_index_get",
-	                           "rna_Action_active_pose_marker_index_set", "rna_Action_active_pose_marker_index_range");
-	RNA_def_property_ui_text(prop, "Active Pose Marker Index", "Index of active pose marker");
+  StructRNA *srna;
+  PropertyRNA *prop;
+
+  FunctionRNA *func;
+  PropertyRNA *parm;
+
+  RNA_def_property_srna(cprop, "ActionPoseMarkers");
+  srna = RNA_def_struct(brna, "ActionPoseMarkers", NULL);
+  RNA_def_struct_sdna(srna, "bAction");
+  RNA_def_struct_ui_text(srna, "Action Pose Markers", "Collection of timeline markers");
+
+  func = RNA_def_function(srna, "new", "rna_Action_pose_markers_new");
+  RNA_def_function_ui_description(func, "Add a pose marker to the action");
+  parm = RNA_def_string(func, "name", "Marker", 0, NULL, "New name for the marker (not unique)");
+  RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+  parm = RNA_def_pointer(func, "marker", "TimelineMarker", "", "Newly created marker");
+  RNA_def_function_return(func, parm);
+
+  func = RNA_def_function(srna, "remove", "rna_Action_pose_markers_remove");
+  RNA_def_function_ui_description(func, "Remove a timeline marker");
+  RNA_def_function_flag(func, FUNC_USE_REPORTS);
+  parm = RNA_def_pointer(func, "marker", "TimelineMarker", "", "Timeline marker to remove");
+  RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
+  RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
+
+  prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
+  RNA_def_property_struct_type(prop, "TimelineMarker");
+  RNA_def_property_flag(prop, PROP_EDITABLE | PROP_LIB_EXCEPTION);
+  RNA_def_property_pointer_funcs(
+      prop, "rna_Action_active_pose_marker_get", "rna_Action_active_pose_marker_set", NULL, NULL);
+  RNA_def_property_ui_text(prop, "Active Pose Marker", "Active pose marker for this action");
+
+  prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
+  RNA_def_property_int_sdna(prop, NULL, "active_marker");
+  RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
+  RNA_def_property_int_funcs(prop,
+                             "rna_Action_active_pose_marker_index_get",
+                             "rna_Action_active_pose_marker_index_set",
+                             "rna_Action_active_pose_marker_index_range");
+  RNA_def_property_ui_text(prop, "Active Pose Marker Index", "Index of active pose marker");
 }
 
 static void rna_def_action(BlenderRNA *brna)
 {
-	StructRNA *srna;
-	PropertyRNA *prop;
-
-	srna = RNA_def_struct(brna, "Action", "ID");
-	RNA_def_struct_sdna(srna, "bAction");
-	RNA_def_struct_ui_text(srna, "Action", "A collection of F-Curves for animation");
-	RNA_def_struct_ui_icon(srna, ICON_ACTION);
-
-	/* collections */
-	prop = RNA_def_property(srna, "fcurves", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_collection_sdna(prop, NULL, "curves", NULL);
-	RNA_def_property_struct_type(prop, "FCurve");
-	RNA_def_property_ui_text(prop, "F-Curves", "The individual F-Curves that make up the action");
-	rna_def_action_fcurves(brna, prop);
-
-	prop = RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_collection_sdna(prop, NULL, "groups", NULL);
-	RNA_def_property_struct_type(prop, "ActionGroup");
-	RNA_def_property_ui_text(prop, "Groups", "Convenient groupings of F-Curves");
-	rna_def_action_groups(brna, prop);
-
-	prop = RNA_def_property(srna, "pose_markers", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_collection_sdna(prop, NULL, "markers", NULL);
-	RNA_def_property_struct_type(prop, "TimelineMarker");
-	/* Use lib exception so the list isn't grayed out; adding/removing is still banned though, see T45689 */
-	RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
-	RNA_def_property_ui_text(prop, "Pose Markers", "Markers specific to this action, for labeling poses");
-	rna_def_action_pose_markers(brna, prop);
-
-	/* properties */
-	prop = RNA_def_float_vector(srna, "frame_range", 2, NULL, 0, 0, "Frame Range",
-	                            "The final frame range of all F-Curves within this action", 0, 0);
-	RNA_def_property_float_funcs(prop, "rna_Action_frame_range_get", NULL, NULL);
-	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-
-	/* special "type" limiter - should not really be edited in general,
-	 * but is still available/editable in 'emergencies' */
-	prop = RNA_def_property(srna, "id_root", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "idroot");
-	RNA_def_property_enum_items(prop, rna_enum_id_type_items);
-	RNA_def_property_ui_text(prop, "ID Root Type",
-	                         "Type of ID block that action can be used on - "
-	                         "DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING");
-	RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ID);
-
-	/* API calls */
-	RNA_api_action(srna);
+  StructRNA *srna;
+  PropertyRNA *prop;
+
+  srna = RNA_def_struct(brna, "Action", "ID");
+  RNA_def_struct_sdna(srna, "bAction");
+  RNA_def_struct_ui_text(srna, "Action", "A collection of F-Curves for animation");
+  RNA_def_struct_ui_icon(srna, ICON_ACTION);
+
+  /* collections */
+  prop = RNA_def_property(srna, "fcurves", PROP_COLLECTION, PROP_NONE);
+  RNA_def_property_collection_sdna(prop, NULL, "curves", NULL);
+  RNA_def_property_struct_type(prop, "FCurve");
+  RNA_def_property_ui_text(prop, "F-Curves", "The individual F-Curves that make up the action");
+  rna_def_action_fcurves(brna, prop);
+
+  prop = RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE);
+  RNA_def_property_collection_sdna(prop, NULL, "groups", NULL);
+  RNA_def_property_struct_type(prop, "ActionGroup");
+  RNA_def_property_ui_text(prop, "Groups", "Convenient groupings of F-Curves");
+  rna_def_action_groups(brna, prop);
+
+  prop = RNA_def_property(srna, "pose_markers", PROP_COLLECTION, PROP_NONE);
+  RNA_def_property_collection_sdna(prop, NULL, "markers", NULL);
+  RNA_def_property_struct_type(prop, "TimelineMarker");
+  /* Use lib exception so the list isn't grayed out; adding/removing is still banned though, see T45689 */
+  RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
+  RNA_def_property_ui_text(
+      prop, "Pose Markers", "Markers specific to this action, for labeling poses");
+  rna_def_action_pose_markers(brna, prop);
+
+  /* properties */
+  prop = RNA_def_float_vector(srna,
+                              "frame_range",
+                              2,
+                              NULL,
+                              0,
+                              0,
+                              "Frame Range",
+                              "The final frame range of all F-Curves within this action",
+                              0,
+                              0);
+  RNA_def_property_float_funcs(prop, "rna_Action_frame_range_get", NULL, NULL);
+  RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+  /* special "type" limiter - should not really be edited in general,
+   * but is still available/editable in 'emergencies' */
+  prop = RNA_def_property(srna, "id_root", PROP_ENUM, PROP_NONE);
+  RNA_def_property_enum_sdna(prop, NULL, "idroot");
+  RNA_def_property_enum_items(prop, rna_enum_id_type_items);
+  RNA_def_property_ui_text(prop,
+                           "ID Root Type",
+                           "Type of ID block that action can be used on - "
+                           "DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING");
+  RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ID);
+
+  /* API calls */
+  RNA_api_action(srna);
 }
 
 /* --------- */
 
 void RNA_def_action(BlenderRNA *brna)
 {
-	rna_def_action(brna);
-	rna_def_action_group(brna);
-	rna_def_dopesheet(brna);
+  rna_def_action(brna);
+  rna_def_action_group(brna);
+  rna_def_dopesheet(brna);
 }
 
-
 #endif