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, 1085 insertions, 1071 deletions

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 7a9bb1df477..beffa47b2c5 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -76,24 +76,24 @@
 /* helper function for getting the list of markers to work on */
 static ListBase *context_get_markers(Scene *scene, ScrArea *sa)
 {
-	/* local marker sets... */
-	if (sa) {
-		if (sa->spacetype == SPACE_ACTION) {
-			SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
-
-			/* local markers can only be shown when there's only a single active action to grab them from
-			 * - flag only takes effect when there's an action, otherwise it can get too confusing?
-			 */
-			if (ELEM(saction->mode, SACTCONT_ACTION, SACTCONT_SHAPEKEY) && (saction->action)) {
-				if (saction->flag & SACTION_POSEMARKERS_SHOW) {
-					return &saction->action->markers;
-				}
-			}
-		}
-	}
-
-	/* default to using the scene's markers */
-	return &scene->markers;
+  /* local marker sets... */
+  if (sa) {
+    if (sa->spacetype == SPACE_ACTION) {
+      SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
+
+      /* local markers can only be shown when there's only a single active action to grab them from
+       * - flag only takes effect when there's an action, otherwise it can get too confusing?
+       */
+      if (ELEM(saction->mode, SACTCONT_ACTION, SACTCONT_SHAPEKEY) && (saction->action)) {
+        if (saction->flag & SACTION_POSEMARKERS_SHOW) {
+          return &saction->action->markers;
+        }
+      }
+    }
+  }
+
+  /* default to using the scene's markers */
+  return &scene->markers;
 }
 
 /* ............. */
@@ -101,16 +101,16 @@ static ListBase *context_get_markers(Scene *scene, ScrArea *sa)
 /* public API for getting markers from context */
 ListBase *ED_context_get_markers(const bContext *C)
 {
-	return context_get_markers(CTX_data_scene(C), CTX_wm_area(C));
+  return context_get_markers(CTX_data_scene(C), CTX_wm_area(C));
 }
 
 /* public API for getting markers from "animation" context */
 ListBase *ED_animcontext_get_markers(const bAnimContext *ac)
 {
-	if (ac)
-		return context_get_markers(ac->scene, ac->sa);
-	else
-		return NULL;
+  if (ac)
+    return context_get_markers(ac->scene, ac->sa);
+  else
+    return NULL;
 }
 
 /* --------------------------------- */
@@ -125,48 +125,43 @@ ListBase *ED_animcontext_get_markers(const bAnimContext *ac)
  * (which is delta transform for grab/extend, and scale factor for scale)
  * \param side: (B/L/R) for 'extend' functionality, which side of current frame to use
  */
-int ED_markers_post_apply_transform(ListBase *markers, Scene *scene, int mode, float value, char side)
+int ED_markers_post_apply_transform(
+    ListBase *markers, Scene *scene, int mode, float value, char side)
 {
-	TimeMarker *marker;
-	float cfra = (float)CFRA;
-	int changed_tot = 0;
-
-	/* sanity check - no markers, or locked markers */
-	if ((scene->toolsettings->lock_markers) ||
-	    (markers == NULL))
-	{
-		return changed_tot;
-	}
-
-	/* affect selected markers - it's unlikely that we will want to affect all in this way? */
-	for (marker = markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			switch (mode) {
-				case TFM_TIME_TRANSLATE:
-				case TFM_TIME_EXTEND:
-				{
-					/* apply delta if marker is on the right side of the current frame */
-					if ((side == 'B') ||
-					    (side == 'L' && marker->frame < cfra) ||
-					    (side == 'R' && marker->frame >= cfra))
-					{
-						marker->frame += round_fl_to_int(value);
-						changed_tot++;
-					}
-					break;
-				}
-				case TFM_TIME_SCALE:
-				{
-					/* rescale the distance between the marker and the current frame */
-					marker->frame = cfra + round_fl_to_int((float)(marker->frame - cfra) * value);
-					changed_tot++;
-					break;
-				}
-			}
-		}
-	}
-
-	return changed_tot;
+  TimeMarker *marker;
+  float cfra = (float)CFRA;
+  int changed_tot = 0;
+
+  /* sanity check - no markers, or locked markers */
+  if ((scene->toolsettings->lock_markers) || (markers == NULL)) {
+    return changed_tot;
+  }
+
+  /* affect selected markers - it's unlikely that we will want to affect all in this way? */
+  for (marker = markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      switch (mode) {
+        case TFM_TIME_TRANSLATE:
+        case TFM_TIME_EXTEND: {
+          /* apply delta if marker is on the right side of the current frame */
+          if ((side == 'B') || (side == 'L' && marker->frame < cfra) ||
+              (side == 'R' && marker->frame >= cfra)) {
+            marker->frame += round_fl_to_int(value);
+            changed_tot++;
+          }
+          break;
+        }
+        case TFM_TIME_SCALE: {
+          /* rescale the distance between the marker and the current frame */
+          marker->frame = cfra + round_fl_to_int((float)(marker->frame - cfra) * value);
+          changed_tot++;
+          break;
+        }
+      }
+    }
+  }
+
+  return changed_tot;
 }
 
 /* --------------------------------- */
@@ -175,58 +170,57 @@ int ED_markers_post_apply_transform(ListBase *markers, Scene *scene, int mode, f
 /* XXX for select, the min_dist should be small */
 TimeMarker *ED_markers_find_nearest_marker(ListBase *markers, float x)
 {
-	TimeMarker *marker, *nearest = NULL;
-	float dist, min_dist = 1000000;
+  TimeMarker *marker, *nearest = NULL;
+  float dist, min_dist = 1000000;
 
-	if (markers) {
-		for (marker = markers->first; marker; marker = marker->next) {
-			dist = fabsf((float)marker->frame - x);
+  if (markers) {
+    for (marker = markers->first; marker; marker = marker->next) {
+      dist = fabsf((float)marker->frame - x);
 
-			if (dist < min_dist) {
-				min_dist = dist;
-				nearest = marker;
-			}
-		}
-	}
+      if (dist < min_dist) {
+        min_dist = dist;
+        nearest = marker;
+      }
+    }
+  }
 
-	return nearest;
+  return nearest;
 }
 
 /* Return the time of the marker that occurs on a frame closest to the given time */
 int ED_markers_find_nearest_marker_time(ListBase *markers, float x)
 {
-	TimeMarker *nearest = ED_markers_find_nearest_marker(markers, x);
-	return (nearest) ? (nearest->frame) : round_fl_to_int(x);
+  TimeMarker *nearest = ED_markers_find_nearest_marker(markers, x);
+  return (nearest) ? (nearest->frame) : round_fl_to_int(x);
 }
 
-
 void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *last)
 {
-	TimeMarker *marker;
-	float min, max;
-
-	/* sanity check */
-	//printf("markers = %p -  %p, %p\n", markers, markers->first, markers->last);
-	if (ELEM(NULL, markers, markers->first, markers->last)) {
-		*first = 0.0f;
-		*last = 0.0f;
-		return;
-	}
-
-	min = FLT_MAX;
-	max = -FLT_MAX;
-	for (marker = markers->first; marker; marker = marker->next) {
-		if (!sel || (marker->flag & SELECT)) {
-			if (marker->frame < min)
-				min = (float)marker->frame;
-			if (marker->frame > max)
-				max = (float)marker->frame;
-		}
-	}
-
-	/* set the min/max values */
-	*first = min;
-	*last = max;
+  TimeMarker *marker;
+  float min, max;
+
+  /* sanity check */
+  //printf("markers = %p -  %p, %p\n", markers, markers->first, markers->last);
+  if (ELEM(NULL, markers, markers->first, markers->last)) {
+    *first = 0.0f;
+    *last = 0.0f;
+    return;
+  }
+
+  min = FLT_MAX;
+  max = -FLT_MAX;
+  for (marker = markers->first; marker; marker = marker->next) {
+    if (!sel || (marker->flag & SELECT)) {
+      if (marker->frame < min)
+        min = (float)marker->frame;
+      if (marker->frame > max)
+        max = (float)marker->frame;
+    }
+  }
+
+  /* set the min/max values */
+  *first = min;
+  *last = max;
 }
 
 /* --------------------------------- */
@@ -234,31 +228,33 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *la
 /* Adds a marker to list of cfra elems */
 static void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, short only_sel)
 {
-	CfraElem *ce, *cen;
-
-	/* should this one only be considered if it is selected? */
-	if ((only_sel) && ((marker->flag & SELECT) == 0))
-		return;
-
-	/* insertion sort - try to find a previous cfra elem */
-	for (ce = lb->first; ce; ce = ce->next) {
-		if (ce->cfra == marker->frame) {
-			/* do because of double keys */
-			if (marker->flag & SELECT)
-				ce->sel = marker->flag;
-			return;
-		}
-		else if (ce->cfra > marker->frame) {
-			break;
-		}
-	}
-
-	cen = MEM_callocN(sizeof(CfraElem), "add_to_cfra_elem");
-	if (ce) BLI_insertlinkbefore(lb, ce, cen);
-	else BLI_addtail(lb, cen);
-
-	cen->cfra = marker->frame;
-	cen->sel = marker->flag;
+  CfraElem *ce, *cen;
+
+  /* should this one only be considered if it is selected? */
+  if ((only_sel) && ((marker->flag & SELECT) == 0))
+    return;
+
+  /* insertion sort - try to find a previous cfra elem */
+  for (ce = lb->first; ce; ce = ce->next) {
+    if (ce->cfra == marker->frame) {
+      /* do because of double keys */
+      if (marker->flag & SELECT)
+        ce->sel = marker->flag;
+      return;
+    }
+    else if (ce->cfra > marker->frame) {
+      break;
+    }
+  }
+
+  cen = MEM_callocN(sizeof(CfraElem), "add_to_cfra_elem");
+  if (ce)
+    BLI_insertlinkbefore(lb, ce, cen);
+  else
+    BLI_addtail(lb, cen);
+
+  cen->cfra = marker->frame;
+  cen->sel = marker->flag;
 }
 
 /* This function makes a list of all the markers. The only_sel
@@ -267,47 +263,47 @@ static void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, short only
  */
 void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, short only_sel)
 {
-	TimeMarker *marker;
-
-	if (lb) {
-		/* Clear the list first, since callers have no way of knowing
-		 * whether this terminated early otherwise. This may lead
-		 * to crashes if the user didn't clear the memory first.
-		 */
-		lb->first = lb->last = NULL;
-	}
-	else {
-		return;
-	}
-
-	if (markers == NULL) {
-		return;
-	}
-
-	for (marker = markers->first; marker; marker = marker->next)
-		add_marker_to_cfra_elem(lb, marker, only_sel);
+  TimeMarker *marker;
+
+  if (lb) {
+    /* Clear the list first, since callers have no way of knowing
+     * whether this terminated early otherwise. This may lead
+     * to crashes if the user didn't clear the memory first.
+     */
+    lb->first = lb->last = NULL;
+  }
+  else {
+    return;
+  }
+
+  if (markers == NULL) {
+    return;
+  }
+
+  for (marker = markers->first; marker; marker = marker->next)
+    add_marker_to_cfra_elem(lb, marker, only_sel);
 }
 
 void ED_markers_deselect_all(ListBase *markers, int action)
 {
-	if (action == SEL_TOGGLE) {
-		action = ED_markers_get_first_selected(markers) ? SEL_DESELECT : SEL_SELECT;
-	}
-
-	for (TimeMarker *marker = markers->first; marker; marker = marker->next) {
-		if (action == SEL_SELECT) {
-			marker->flag |= SELECT;
-		}
-		else if (action == SEL_DESELECT) {
-			marker->flag &= ~SELECT;
-		}
-		else if (action == SEL_INVERT) {
-			marker->flag ^= SELECT;
-		}
-		else {
-			BLI_assert(0);
-		}
-	}
+  if (action == SEL_TOGGLE) {
+    action = ED_markers_get_first_selected(markers) ? SEL_DESELECT : SEL_SELECT;
+  }
+
+  for (TimeMarker *marker = markers->first; marker; marker = marker->next) {
+    if (action == SEL_SELECT) {
+      marker->flag |= SELECT;
+    }
+    else if (action == SEL_DESELECT) {
+      marker->flag &= ~SELECT;
+    }
+    else if (action == SEL_INVERT) {
+      marker->flag ^= SELECT;
+    }
+    else {
+      BLI_assert(0);
+    }
+  }
 }
 
 /* --------------------------------- */
@@ -315,16 +311,16 @@ void ED_markers_deselect_all(ListBase *markers, int action)
 /* Get the first selected marker */
 TimeMarker *ED_markers_get_first_selected(ListBase *markers)
 {
-	TimeMarker *marker;
+  TimeMarker *marker;
 
-	if (markers) {
-		for (marker = markers->first; marker; marker = marker->next) {
-			if (marker->flag & SELECT)
-				return marker;
-		}
-	}
+  if (markers) {
+    for (marker = markers->first; marker; marker = marker->next) {
+      if (marker->flag & SELECT)
+        return marker;
+    }
+  }
 
-	return NULL;
+  return NULL;
 }
 
 /* --------------------------------- */
@@ -334,226 +330,229 @@ TimeMarker *ED_markers_get_first_selected(ListBase *markers)
  */
 void debug_markers_print_list(ListBase *markers)
 {
-	TimeMarker *marker;
+  TimeMarker *marker;
 
-	if (markers == NULL) {
-		printf("No markers list to print debug for\n");
-		return;
-	}
+  if (markers == NULL) {
+    printf("No markers list to print debug for\n");
+    return;
+  }
 
-	printf("List of markers follows: -----\n");
+  printf("List of markers follows: -----\n");
 
-	for (marker = markers->first; marker; marker = marker->next) {
-		printf("\t'%s' on %d at %p with %u\n", marker->name, marker->frame, (void *)marker, marker->flag);
-	}
+  for (marker = markers->first; marker; marker = marker->next) {
+    printf(
+        "\t'%s' on %d at %p with %u\n", marker->name, marker->frame, (void *)marker, marker->flag);
+  }
 
-	printf("End of list ------------------\n");
+  printf("End of list ------------------\n");
 }
 
 /* ************* Marker Drawing ************ */
 
-static void draw_marker_name(
-        const uiFontStyle *fstyle, TimeMarker *marker, const char *name,
-        int cfra, const float xpos, const float ypixels)
+static void draw_marker_name(const uiFontStyle *fstyle,
+                             TimeMarker *marker,
+                             const char *name,
+                             int cfra,
+                             const float xpos,
+                             const float ypixels)
 {
-	unsigned char text_col[4];
-	float x, y;
-
-	/* minimal y coordinate which wouldn't be occluded by scroll */
-	int min_y = 17.0f * UI_DPI_FAC;
-
-	if (marker->flag & SELECT) {
-		UI_GetThemeColor4ubv(TH_TEXT_HI, text_col);
-		x = xpos + 4.0f * UI_DPI_FAC;
-		y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
-		y = max_ii(y, min_y);
-	}
-	else {
-		UI_GetThemeColor4ubv(TH_TEXT, text_col);
-		if ((marker->frame <= cfra) && (marker->frame + 5 > cfra)) {
-			x = xpos + 8.0f * UI_DPI_FAC;
-			y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
-			y = max_ii(y, min_y);
-		}
-		else {
-			x = xpos + 8.0f * UI_DPI_FAC;
-			y = 17.0f * UI_DPI_FAC;
-		}
-	}
+  unsigned char text_col[4];
+  float x, y;
+
+  /* minimal y coordinate which wouldn't be occluded by scroll */
+  int min_y = 17.0f * UI_DPI_FAC;
+
+  if (marker->flag & SELECT) {
+    UI_GetThemeColor4ubv(TH_TEXT_HI, text_col);
+    x = xpos + 4.0f * UI_DPI_FAC;
+    y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
+    y = max_ii(y, min_y);
+  }
+  else {
+    UI_GetThemeColor4ubv(TH_TEXT, text_col);
+    if ((marker->frame <= cfra) && (marker->frame + 5 > cfra)) {
+      x = xpos + 8.0f * UI_DPI_FAC;
+      y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
+      y = max_ii(y, min_y);
+    }
+    else {
+      x = xpos + 8.0f * UI_DPI_FAC;
+      y = 17.0f * UI_DPI_FAC;
+    }
+  }
 
 #ifdef DURIAN_CAMERA_SWITCH
-	if (marker->camera && (marker->camera->restrictflag & OB_RESTRICT_RENDER)) {
-		text_col[3] = 100;
-	}
+  if (marker->camera && (marker->camera->restrictflag & OB_RESTRICT_RENDER)) {
+    text_col[3] = 100;
+  }
 #endif
 
-	UI_fontstyle_draw_simple(fstyle, x, y, name, text_col);
+  UI_fontstyle_draw_simple(fstyle, x, y, name, text_col);
 }
 
 static void draw_marker_line(const float color[4], float x, float ymin, float ymax)
 {
-	GPUVertFormat *format = immVertexFormat();
-	uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+  GPUVertFormat *format = immVertexFormat();
+  uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
-	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+  immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-	float viewport_size[4];
-	GPU_viewport_size_get_f(viewport_size);
-	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+  float viewport_size[4];
+  GPU_viewport_size_get_f(viewport_size);
+  immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
 
-	immUniformColor4fv(color);
-	immUniform1i("colors_len", 0);  /* "simple" mode */
-	immUniform1f("dash_width", 6.0f);
-	immUniform1f("dash_factor", 0.5f);
+  immUniformColor4fv(color);
+  immUniform1i("colors_len", 0); /* "simple" mode */
+  immUniform1f("dash_width", 6.0f);
+  immUniform1f("dash_factor", 0.5f);
 
-	immBegin(GPU_PRIM_LINES, 2);
-	immVertex2f(pos, x, ymin);
-	immVertex2f(pos, x, ymax);
-	immEnd();
+  immBegin(GPU_PRIM_LINES, 2);
+  immVertex2f(pos, x, ymin);
+  immVertex2f(pos, x, ymax);
+  immEnd();
 
-	immUnbindProgram();
+  immUnbindProgram();
 }
 
 /* function to draw markers */
-static void draw_marker(
-        const uiFontStyle *fstyle, TimeMarker *marker, int cfra, int flag,
-        /* avoid re-calculating each time */
-        const float ypixels, const float xscale, int height)
+static void draw_marker(const uiFontStyle *fstyle,
+                        TimeMarker *marker,
+                        int cfra,
+                        int flag,
+                        /* avoid re-calculating each time */
+                        const float ypixels,
+                        const float xscale,
+                        int height)
 {
-	const float xpos = marker->frame * xscale;
+  const float xpos = marker->frame * xscale;
 #ifdef DURIAN_CAMERA_SWITCH
-	const float yoffs = (marker->camera) ?  0.2f * UI_DPI_ICON_SIZE : 0.0f;
+  const float yoffs = (marker->camera) ? 0.2f * UI_DPI_ICON_SIZE : 0.0f;
 #else
-	const float yoffs = 0.0f;
+  const float yoffs = 0.0f;
 #endif
-	int icon_id;
+  int icon_id;
 
-	GPU_blend(true);
-	GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+  GPU_blend(true);
+  GPU_blend_set_func_separate(
+      GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
 
-	/* vertical line - dotted */
+  /* vertical line - dotted */
 #ifdef DURIAN_CAMERA_SWITCH
-	if ((marker->camera) || (flag & DRAW_MARKERS_LINES))
+  if ((marker->camera) || (flag & DRAW_MARKERS_LINES))
 #else
-	if (flag & DRAW_MARKERS_LINES)
+  if (flag & DRAW_MARKERS_LINES)
 #endif
-	{
-		float color[4];
-		if (marker->flag & SELECT) {
-			copy_v4_fl4(color, 1.0f, 1.0f, 1.0f, 0.38f);
-		}
-		else {
-			copy_v4_fl4(color, 0.0f, 0.0f, 0.0f, 0.38f);
-		}
-
-		draw_marker_line(color, xpos, yoffs + 1.5f * UI_DPI_ICON_SIZE, height);
-	}
-
-	/* 5 px to offset icon to align properly, space / pixels corrects for zoom */
-	if (flag & DRAW_MARKERS_LOCAL) {
-		icon_id = (marker->flag & ACTIVE) ? ICON_PMARKER_ACT :
-		          (marker->flag & SELECT) ? ICON_PMARKER_SEL :
-		          ICON_PMARKER;
-	}
+  {
+    float color[4];
+    if (marker->flag & SELECT) {
+      copy_v4_fl4(color, 1.0f, 1.0f, 1.0f, 0.38f);
+    }
+    else {
+      copy_v4_fl4(color, 0.0f, 0.0f, 0.0f, 0.38f);
+    }
+
+    draw_marker_line(color, xpos, yoffs + 1.5f * UI_DPI_ICON_SIZE, height);
+  }
+
+  /* 5 px to offset icon to align properly, space / pixels corrects for zoom */
+  if (flag & DRAW_MARKERS_LOCAL) {
+    icon_id = (marker->flag & ACTIVE) ? ICON_PMARKER_ACT :
+                                        (marker->flag & SELECT) ? ICON_PMARKER_SEL : ICON_PMARKER;
+  }
 #ifdef DURIAN_CAMERA_SWITCH
-	else if (marker->camera) {
-		icon_id = (marker->flag & SELECT) ? ICON_OUTLINER_OB_CAMERA :
-		          ICON_CAMERA_DATA;
-	}
+  else if (marker->camera) {
+    icon_id = (marker->flag & SELECT) ? ICON_OUTLINER_OB_CAMERA : ICON_CAMERA_DATA;
+  }
 #endif
-	else {
-		icon_id = (marker->flag & SELECT) ? ICON_MARKER_HLT :
-		          ICON_MARKER;
-	}
+  else {
+    icon_id = (marker->flag & SELECT) ? ICON_MARKER_HLT : ICON_MARKER;
+  }
 
-	UI_icon_draw(xpos - 0.55f * UI_DPI_ICON_SIZE, yoffs + UI_DPI_ICON_SIZE, icon_id);
+  UI_icon_draw(xpos - 0.55f * UI_DPI_ICON_SIZE, yoffs + UI_DPI_ICON_SIZE, icon_id);
 
-	GPU_blend(false);
+  GPU_blend(false);
 
-	/* and the marker name too, shifted slightly to the top-right */
+  /* and the marker name too, shifted slightly to the top-right */
 #ifdef DURIAN_CAMERA_SWITCH
-	if (marker->camera) {
-		draw_marker_name(fstyle, marker, marker->camera->id.name + 2, cfra, xpos, ypixels);
-	}
-	else if (marker->name[0]) {
-		draw_marker_name(fstyle, marker, marker->name, cfra, xpos, ypixels);
-	}
+  if (marker->camera) {
+    draw_marker_name(fstyle, marker, marker->camera->id.name + 2, cfra, xpos, ypixels);
+  }
+  else if (marker->name[0]) {
+    draw_marker_name(fstyle, marker, marker->name, cfra, xpos, ypixels);
+  }
 #else
-	if (marker->name[0]) {
-		draw_marker_name(fstyle, marker, marker->name, cfra, xpos, ypixels);
-
-	}
+  if (marker->name[0]) {
+    draw_marker_name(fstyle, marker, marker->name, cfra, xpos, ypixels);
+  }
 #endif
 }
 
 /* Draw Scene-Markers in time window */
 void ED_markers_draw(const bContext *C, int flag)
 {
-	const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
-	ListBase *markers = ED_context_get_markers(C);
-	View2D *v2d;
-	TimeMarker *marker;
-	Scene *scene;
-	int select_pass;
-	int v2d_clip_range_x[2];
-	float font_width_max;
-
-	/* cache values */
-	float ypixels, xscale, yscale;
-
-	if (markers == NULL || BLI_listbase_is_empty(markers)) {
-		return;
-	}
-
-	scene = CTX_data_scene(C);
-	v2d = UI_view2d_fromcontext(C);
-	int height = v2d->mask.ymax - v2d->mask.ymin;
-
-	if (flag & DRAW_MARKERS_MARGIN) {
-		uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
-		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-
-		const unsigned char shade[4] = {0, 0, 0, 16};
-		immUniformColor4ubv(shade);
-
-		GPU_blend(true);
-		GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
-
-		immRectf(pos, v2d->cur.xmin, 0, v2d->cur.xmax, UI_MARKER_MARGIN_Y);
-
-		GPU_blend(false);
-
-		immUnbindProgram();
-	}
-
-	/* no time correction for framelen! space is drawn with old values */
-	ypixels = BLI_rcti_size_y(&v2d->mask);
-	UI_view2d_scale_get(v2d, &xscale, &yscale);
-	GPU_matrix_push();
-	GPU_matrix_scale_2f(1.0f / xscale, 1.0f);
-
-	/* x-bounds with offset for text (adjust for long string, avoid checking string width) */
-	font_width_max = (10 * UI_DPI_FAC) / xscale;
-	v2d_clip_range_x[0] = v2d->cur.xmin - (sizeof(marker->name) * font_width_max);
-	v2d_clip_range_x[1] = v2d->cur.xmax + font_width_max;
-
-	/* loop [unselected, selected] */
-	for (select_pass = 0; select_pass <= SELECT; select_pass += SELECT) {
-		/* unselected markers are drawn at the first time */
-		for (marker = markers->first; marker; marker = marker->next) {
-			if ((marker->flag & SELECT) == select_pass) {
-				/* bounds check */
-				if ((marker->frame >= v2d_clip_range_x[0]) &&
-				    (marker->frame <= v2d_clip_range_x[1]))
-				{
-					draw_marker(fstyle, marker, scene->r.cfra, flag,
-					            ypixels, xscale, height);
-				}
-			}
-		}
-	}
-
-	GPU_matrix_pop();
+  const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
+  ListBase *markers = ED_context_get_markers(C);
+  View2D *v2d;
+  TimeMarker *marker;
+  Scene *scene;
+  int select_pass;
+  int v2d_clip_range_x[2];
+  float font_width_max;
+
+  /* cache values */
+  float ypixels, xscale, yscale;
+
+  if (markers == NULL || BLI_listbase_is_empty(markers)) {
+    return;
+  }
+
+  scene = CTX_data_scene(C);
+  v2d = UI_view2d_fromcontext(C);
+  int height = v2d->mask.ymax - v2d->mask.ymin;
+
+  if (flag & DRAW_MARKERS_MARGIN) {
+    uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+    immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+    const unsigned char shade[4] = {0, 0, 0, 16};
+    immUniformColor4ubv(shade);
+
+    GPU_blend(true);
+    GPU_blend_set_func_separate(
+        GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+
+    immRectf(pos, v2d->cur.xmin, 0, v2d->cur.xmax, UI_MARKER_MARGIN_Y);
+
+    GPU_blend(false);
+
+    immUnbindProgram();
+  }
+
+  /* no time correction for framelen! space is drawn with old values */
+  ypixels = BLI_rcti_size_y(&v2d->mask);
+  UI_view2d_scale_get(v2d, &xscale, &yscale);
+  GPU_matrix_push();
+  GPU_matrix_scale_2f(1.0f / xscale, 1.0f);
+
+  /* x-bounds with offset for text (adjust for long string, avoid checking string width) */
+  font_width_max = (10 * UI_DPI_FAC) / xscale;
+  v2d_clip_range_x[0] = v2d->cur.xmin - (sizeof(marker->name) * font_width_max);
+  v2d_clip_range_x[1] = v2d->cur.xmax + font_width_max;
+
+  /* loop [unselected, selected] */
+  for (select_pass = 0; select_pass <= SELECT; select_pass += SELECT) {
+    /* unselected markers are drawn at the first time */
+    for (marker = markers->first; marker; marker = marker->next) {
+      if ((marker->flag & SELECT) == select_pass) {
+        /* bounds check */
+        if ((marker->frame >= v2d_clip_range_x[0]) && (marker->frame <= v2d_clip_range_x[1])) {
+          draw_marker(fstyle, marker, scene->r.cfra, flag, ypixels, xscale, height);
+        }
+      }
+    }
+  }
+
+  GPU_matrix_pop();
 }
 
 /* ************************ Marker Wrappers API ********************* */
@@ -567,48 +566,47 @@ void ED_markers_draw(const bContext *C, int flag)
 /* special poll() which checks if there are selected markers first */
 static bool ed_markers_poll_selected_markers(bContext *C)
 {
-	ListBase *markers = ED_context_get_markers(C);
+  ListBase *markers = ED_context_get_markers(C);
 
-	/* first things first: markers can only exist in timeline views */
-	if (ED_operator_animview_active(C) == 0)
-		return 0;
+  /* first things first: markers can only exist in timeline views */
+  if (ED_operator_animview_active(C) == 0)
+    return 0;
 
-	/* check if some marker is selected */
-	return ED_markers_get_first_selected(markers) != NULL;
+  /* check if some marker is selected */
+  return ED_markers_get_first_selected(markers) != NULL;
 }
 
 static bool ed_markers_poll_selected_no_locked_markers(bContext *C)
 {
-	ListBase *markers = ED_context_get_markers(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
+  ListBase *markers = ED_context_get_markers(C);
+  ToolSettings *ts = CTX_data_tool_settings(C);
 
-	if (ts->lock_markers)
-		return 0;
+  if (ts->lock_markers)
+    return 0;
 
-	/* first things first: markers can only exist in timeline views */
-	if (ED_operator_animview_active(C) == 0)
-		return 0;
+  /* first things first: markers can only exist in timeline views */
+  if (ED_operator_animview_active(C) == 0)
+    return 0;
 
-	/* check if some marker is selected */
-	return ED_markers_get_first_selected(markers) != NULL;
+  /* check if some marker is selected */
+  return ED_markers_get_first_selected(markers) != NULL;
 }
 
-
 /* special poll() which checks if there are any markers at all first */
 static bool ed_markers_poll_markers_exist(bContext *C)
 {
-	ListBase *markers = ED_context_get_markers(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
+  ListBase *markers = ED_context_get_markers(C);
+  ToolSettings *ts = CTX_data_tool_settings(C);
 
-	if (ts->lock_markers)
-		return 0;
+  if (ts->lock_markers)
+    return 0;
 
-	/* first things first: markers can only exist in timeline views */
-	if (ED_operator_animview_active(C) == 0)
-		return 0;
+  /* first things first: markers can only exist in timeline views */
+  if (ED_operator_animview_active(C) == 0)
+    return 0;
 
-	/* list of markers must exist, as well as some markers in it! */
-	return (markers && markers->first);
+  /* list of markers must exist, as well as some markers in it! */
+  return (markers && markers->first);
 }
 
 /* ------------------------ */
@@ -622,29 +620,34 @@ static bool ed_markers_poll_markers_exist(bContext *C)
  * If NULL, the operator's standard exec()
  * callback will be called instead in the appropriate places.
  */
-static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, const wmEvent *event,
-                                           int (*invoke_func)(bContext *, wmOperator *, const wmEvent *))
+static int ed_markers_opwrap_invoke_custom(bContext *C,
+                                           wmOperator *op,
+                                           const wmEvent *event,
+                                           int (*invoke_func)(bContext *,
+                                                              wmOperator *,
+                                                              const wmEvent *))
 {
-	int retval = OPERATOR_PASS_THROUGH;
-
-	/* removed check for Y coord of event, keymap has bounbox now */
-
-	/* allow operator to run now */
-	if (invoke_func)
-		retval = invoke_func(C, op, event);
-	else if (op->type->exec)
-		retval = op->type->exec(C, op);
-	else
-		BKE_report(op->reports, RPT_ERROR, "Programming error: operator does not actually have code to do anything!");
-
-
-	/* unless successful, must add "pass-through"
-	 * to let normal operator's have a chance at tackling this event */
-	if ((retval & (OPERATOR_FINISHED | OPERATOR_INTERFACE)) == 0) {
-		retval |= OPERATOR_PASS_THROUGH;
-	}
-
-	return retval;
+  int retval = OPERATOR_PASS_THROUGH;
+
+  /* removed check for Y coord of event, keymap has bounbox now */
+
+  /* allow operator to run now */
+  if (invoke_func)
+    retval = invoke_func(C, op, event);
+  else if (op->type->exec)
+    retval = op->type->exec(C, op);
+  else
+    BKE_report(op->reports,
+               RPT_ERROR,
+               "Programming error: operator does not actually have code to do anything!");
+
+  /* unless successful, must add "pass-through"
+   * to let normal operator's have a chance at tackling this event */
+  if ((retval & (OPERATOR_FINISHED | OPERATOR_INTERFACE)) == 0) {
+    retval |= OPERATOR_PASS_THROUGH;
+  }
+
+  return retval;
 }
 
 /* standard wrapper - first-tier invoke() callback to be directly assigned to operator typedata
@@ -654,7 +657,7 @@ static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, const wm
  */
 static int ed_markers_opwrap_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	return ed_markers_opwrap_invoke_custom(C, op, event, NULL);
+  return ed_markers_opwrap_invoke_custom(C, op, event, NULL);
 }
 
 /* ************************** add markers *************************** */
@@ -662,50 +665,50 @@ static int ed_markers_opwrap_invoke(bContext *C, wmOperator *op, const wmEvent *
 /* add TimeMarker at current frame */
 static int ed_marker_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	ListBase *markers = ED_context_get_markers(C);
-	TimeMarker *marker;
-	int frame = CTX_data_scene(C)->r.cfra;
-
-	if (markers == NULL)
-		return OPERATOR_CANCELLED;
-
-	/* prefer not having 2 markers at the same place,
-	 * though the user can move them to overlap once added */
-	for (marker = markers->first; marker; marker = marker->next) {
-		if (marker->frame == frame)
-			return OPERATOR_CANCELLED;
-	}
-
-	/* deselect all */
-	for (marker = markers->first; marker; marker = marker->next)
-		marker->flag &= ~SELECT;
-
-	marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
-	marker->flag = SELECT;
-	marker->frame = frame;
-	BLI_snprintf(marker->name, sizeof(marker->name), "F_%02d", frame); // XXX - temp code only
-	BLI_addtail(markers, marker);
-
-	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
-
-	return OPERATOR_FINISHED;
+  ListBase *markers = ED_context_get_markers(C);
+  TimeMarker *marker;
+  int frame = CTX_data_scene(C)->r.cfra;
+
+  if (markers == NULL)
+    return OPERATOR_CANCELLED;
+
+  /* prefer not having 2 markers at the same place,
+   * though the user can move them to overlap once added */
+  for (marker = markers->first; marker; marker = marker->next) {
+    if (marker->frame == frame)
+      return OPERATOR_CANCELLED;
+  }
+
+  /* deselect all */
+  for (marker = markers->first; marker; marker = marker->next)
+    marker->flag &= ~SELECT;
+
+  marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
+  marker->flag = SELECT;
+  marker->frame = frame;
+  BLI_snprintf(marker->name, sizeof(marker->name), "F_%02d", frame);  // XXX - temp code only
+  BLI_addtail(markers, marker);
+
+  WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+
+  return OPERATOR_FINISHED;
 }
 
 static void MARKER_OT_add(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Add Time Marker";
-	ot->description = "Add a new time marker";
-	ot->idname = "MARKER_OT_add";
-
-	/* api callbacks */
-	ot->exec = ed_marker_add_exec;
-	ot->invoke = ed_markers_opwrap_invoke;
-	ot->poll = ED_operator_animview_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* identifiers */
+  ot->name = "Add Time Marker";
+  ot->description = "Add a new time marker";
+  ot->idname = "MARKER_OT_add";
+
+  /* api callbacks */
+  ot->exec = ed_marker_add_exec;
+  ot->invoke = ed_markers_opwrap_invoke;
+  ot->poll = ED_operator_animview_active;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* ************************** transform markers *************************** */
@@ -733,315 +736,323 @@ static void MARKER_OT_add(wmOperatorType *ot)
  */
 
 typedef struct MarkerMove {
-	SpaceLink *slink;
-	ListBase *markers;
-	int event_type;     /* store invoke-event, to verify */
-	int *oldframe, evtx, firstx;
-	NumInput num;
+  SpaceLink *slink;
+  ListBase *markers;
+  int event_type; /* store invoke-event, to verify */
+  int *oldframe, evtx, firstx;
+  NumInput num;
 } MarkerMove;
 
 static bool ed_marker_move_use_time(MarkerMove *mm)
 {
-	if (((mm->slink->spacetype == SPACE_SEQ) && !(((SpaceSeq *)mm->slink)->flag & SEQ_DRAWFRAMES)) ||
-	    ((mm->slink->spacetype == SPACE_ACTION) && (((SpaceAction *)mm->slink)->flag & SACTION_DRAWTIME)) ||
-	    ((mm->slink->spacetype == SPACE_GRAPH) && !(((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) ||
-	    ((mm->slink->spacetype == SPACE_NLA) && !(((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME)))
-	{
-		return true;
-	}
-
-	return false;
+  if (((mm->slink->spacetype == SPACE_SEQ) && !(((SpaceSeq *)mm->slink)->flag & SEQ_DRAWFRAMES)) ||
+      ((mm->slink->spacetype == SPACE_ACTION) &&
+       (((SpaceAction *)mm->slink)->flag & SACTION_DRAWTIME)) ||
+      ((mm->slink->spacetype == SPACE_GRAPH) &&
+       !(((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) ||
+      ((mm->slink->spacetype == SPACE_NLA) && !(((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME))) {
+    return true;
+  }
+
+  return false;
 }
 
 static void ed_marker_move_update_header(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	MarkerMove *mm = op->customdata;
-	TimeMarker *marker, *selmarker = NULL;
-	const int offs = RNA_int_get(op->ptr, "frames");
-	char str[UI_MAX_DRAW_STR];
-	char str_offs[NUM_STR_REP_LEN];
-	int totmark;
-	const bool use_time = ed_marker_move_use_time(mm);
-
-	for (totmark = 0, marker = mm->markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			selmarker = marker;
-			totmark++;
-		}
-	}
-
-	if (hasNumInput(&mm->num)) {
-		outputNumInput(&mm->num, str_offs, &scene->unit);
-	}
-	else if (use_time) {
-		BLI_snprintf(str_offs, sizeof(str_offs), "%.2f", FRA2TIME(offs));
-	}
-	else {
-		BLI_snprintf(str_offs, sizeof(str_offs), "%d", offs);
-	}
-
-	if (totmark == 1 && selmarker) {
-		/* we print current marker value */
-		if (use_time) {
-			BLI_snprintf(str, sizeof(str), IFACE_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_offs);
-		}
-		else {
-			BLI_snprintf(str, sizeof(str), IFACE_("Marker %d offset %s"), selmarker->frame, str_offs);
-		}
-	}
-	else {
-		BLI_snprintf(str, sizeof(str), IFACE_("Marker offset %s"), str_offs);
-	}
-
-	ED_area_status_text(CTX_wm_area(C), str);
+  Scene *scene = CTX_data_scene(C);
+  MarkerMove *mm = op->customdata;
+  TimeMarker *marker, *selmarker = NULL;
+  const int offs = RNA_int_get(op->ptr, "frames");
+  char str[UI_MAX_DRAW_STR];
+  char str_offs[NUM_STR_REP_LEN];
+  int totmark;
+  const bool use_time = ed_marker_move_use_time(mm);
+
+  for (totmark = 0, marker = mm->markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      selmarker = marker;
+      totmark++;
+    }
+  }
+
+  if (hasNumInput(&mm->num)) {
+    outputNumInput(&mm->num, str_offs, &scene->unit);
+  }
+  else if (use_time) {
+    BLI_snprintf(str_offs, sizeof(str_offs), "%.2f", FRA2TIME(offs));
+  }
+  else {
+    BLI_snprintf(str_offs, sizeof(str_offs), "%d", offs);
+  }
+
+  if (totmark == 1 && selmarker) {
+    /* we print current marker value */
+    if (use_time) {
+      BLI_snprintf(
+          str, sizeof(str), IFACE_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_offs);
+    }
+    else {
+      BLI_snprintf(str, sizeof(str), IFACE_("Marker %d offset %s"), selmarker->frame, str_offs);
+    }
+  }
+  else {
+    BLI_snprintf(str, sizeof(str), IFACE_("Marker offset %s"), str_offs);
+  }
+
+  ED_area_status_text(CTX_wm_area(C), str);
 }
 
 /* copy selection to temp buffer */
 /* return 0 if not OK */
 static bool ed_marker_move_init(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	ListBase *markers = ED_context_get_markers(C);
-	MarkerMove *mm;
-	TimeMarker *marker;
-	int a, totmark;
-
-	if (markers == NULL) {
-		return false;
-	}
-
-	for (totmark = 0, marker = markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			totmark++;
-		}
-	}
-
-	if (totmark == 0) {
-		return false;
-	}
-
-	op->customdata = mm = MEM_callocN(sizeof(MarkerMove), "Markermove");
-	mm->slink = CTX_wm_space_data(C);
-	mm->markers = markers;
-	mm->oldframe = MEM_callocN(totmark * sizeof(int), "MarkerMove oldframe");
-
-	initNumInput(&mm->num);
-	mm->num.idx_max = 0; /* one axis */
-	mm->num.val_flag[0] |= NUM_NO_FRACTION;
-	mm->num.unit_sys = scene->unit.system;
-	/* No time unit supporting frames currently... */
-	mm->num.unit_type[0] = ed_marker_move_use_time(mm) ? B_UNIT_TIME : B_UNIT_NONE;
-
-	for (a = 0, marker = markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			mm->oldframe[a] = marker->frame;
-			a++;
-		}
-	}
-
-	return true;
+  Scene *scene = CTX_data_scene(C);
+  ListBase *markers = ED_context_get_markers(C);
+  MarkerMove *mm;
+  TimeMarker *marker;
+  int a, totmark;
+
+  if (markers == NULL) {
+    return false;
+  }
+
+  for (totmark = 0, marker = markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      totmark++;
+    }
+  }
+
+  if (totmark == 0) {
+    return false;
+  }
+
+  op->customdata = mm = MEM_callocN(sizeof(MarkerMove), "Markermove");
+  mm->slink = CTX_wm_space_data(C);
+  mm->markers = markers;
+  mm->oldframe = MEM_callocN(totmark * sizeof(int), "MarkerMove oldframe");
+
+  initNumInput(&mm->num);
+  mm->num.idx_max = 0; /* one axis */
+  mm->num.val_flag[0] |= NUM_NO_FRACTION;
+  mm->num.unit_sys = scene->unit.system;
+  /* No time unit supporting frames currently... */
+  mm->num.unit_type[0] = ed_marker_move_use_time(mm) ? B_UNIT_TIME : B_UNIT_NONE;
+
+  for (a = 0, marker = markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      mm->oldframe[a] = marker->frame;
+      a++;
+    }
+  }
+
+  return true;
 }
 
 /* free stuff */
 static void ed_marker_move_exit(bContext *C, wmOperator *op)
 {
-	MarkerMove *mm = op->customdata;
+  MarkerMove *mm = op->customdata;
 
-	/* free data */
-	MEM_freeN(mm->oldframe);
-	MEM_freeN(op->customdata);
-	op->customdata = NULL;
+  /* free data */
+  MEM_freeN(mm->oldframe);
+  MEM_freeN(op->customdata);
+  op->customdata = NULL;
 
-	/* clear custom header prints */
-	ED_area_status_text(CTX_wm_area(C), NULL);
+  /* clear custom header prints */
+  ED_area_status_text(CTX_wm_area(C), NULL);
 }
 
 static int ed_marker_move_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	if (ed_marker_move_init(C, op)) {
-		MarkerMove *mm = op->customdata;
+  if (ed_marker_move_init(C, op)) {
+    MarkerMove *mm = op->customdata;
 
-		mm->evtx = event->x;
-		mm->firstx = event->x;
-		mm->event_type = event->type;
+    mm->evtx = event->x;
+    mm->firstx = event->x;
+    mm->event_type = event->type;
 
-		/* add temp handler */
-		WM_event_add_modal_handler(C, op);
+    /* add temp handler */
+    WM_event_add_modal_handler(C, op);
 
-		/* reset frs delta */
-		RNA_int_set(op->ptr, "frames", 0);
+    /* reset frs delta */
+    RNA_int_set(op->ptr, "frames", 0);
 
-		ed_marker_move_update_header(C, op);
+    ed_marker_move_update_header(C, op);
 
-		return OPERATOR_RUNNING_MODAL;
-	}
+    return OPERATOR_RUNNING_MODAL;
+  }
 
-	return OPERATOR_CANCELLED;
+  return OPERATOR_CANCELLED;
 }
 
 static int ed_marker_move_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_move_invoke);
+  return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_move_invoke);
 }
 
 /* note, init has to be called successfully */
 static void ed_marker_move_apply(bContext *C, wmOperator *op)
 {
 #ifdef DURIAN_CAMERA_SWITCH
-	bScreen *sc = CTX_wm_screen(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *camera = scene->camera;
+  bScreen *sc = CTX_wm_screen(C);
+  Scene *scene = CTX_data_scene(C);
+  Object *camera = scene->camera;
 #endif
-	MarkerMove *mm = op->customdata;
-	TimeMarker *marker;
-	int a, offs;
+  MarkerMove *mm = op->customdata;
+  TimeMarker *marker;
+  int a, offs;
 
-	offs = RNA_int_get(op->ptr, "frames");
-	for (a = 0, marker = mm->markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			marker->frame = mm->oldframe[a] + offs;
-			a++;
-		}
-	}
+  offs = RNA_int_get(op->ptr, "frames");
+  for (a = 0, marker = mm->markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      marker->frame = mm->oldframe[a] + offs;
+      a++;
+    }
+  }
 
-	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
 
 #ifdef DURIAN_CAMERA_SWITCH
-	/* so we get view3d redraws */
-	BKE_scene_camera_switch_update(scene);
+  /* so we get view3d redraws */
+  BKE_scene_camera_switch_update(scene);
 
-	if (camera != scene->camera) {
-		BKE_screen_view3d_scene_sync(sc, scene);
-		WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
-	}
+  if (camera != scene->camera) {
+    BKE_screen_view3d_scene_sync(sc, scene);
+    WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
+  }
 #endif
 }
 
 /* only for modal */
 static void ed_marker_move_cancel(bContext *C, wmOperator *op)
 {
-	RNA_int_set(op->ptr, "frames", 0);
-	ed_marker_move_apply(C, op);
-	ed_marker_move_exit(C, op);
+  RNA_int_set(op->ptr, "frames", 0);
+  ed_marker_move_apply(C, op);
+  ed_marker_move_exit(C, op);
 }
 
 static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	Scene *scene = CTX_data_scene(C);
-	MarkerMove *mm = op->customdata;
-	View2D *v2d = UI_view2d_fromcontext(C);
-	const bool has_numinput = hasNumInput(&mm->num);
-	const bool use_time = ed_marker_move_use_time(mm);
-
-	/* Modal numinput active, try to handle numeric inputs first... */
-	if (event->val == KM_PRESS && has_numinput && handleNumInput(C, &mm->num, event)) {
-		float value = (float)RNA_int_get(op->ptr, "frames");
-
-		applyNumInput(&mm->num, &value);
-		if (use_time) {
-			value = TIME2FRA(value);
-		}
-
-		RNA_int_set(op->ptr, "frames", (int)value);
-		ed_marker_move_apply(C, op);
-		ed_marker_move_update_header(C, op);
-	}
-	else {
-		bool handled = false;
-		switch (event->type) {
-			case ESCKEY:
-				ed_marker_move_cancel(C, op);
-				return OPERATOR_CANCELLED;
-			case RIGHTMOUSE:
-				/* press = user manually demands transform to be canceled */
-				if (event->val == KM_PRESS) {
-					ed_marker_move_cancel(C, op);
-					return OPERATOR_CANCELLED;
-				}
-				/* else continue; <--- see if release event should be caught for tweak-end */
-				ATTR_FALLTHROUGH;
-
-			case RETKEY:
-			case PADENTER:
-			case LEFTMOUSE:
-			case MIDDLEMOUSE:
-				if (WM_event_is_modal_tweak_exit(event, mm->event_type)) {
-					ed_marker_move_exit(C, op);
-					WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-					WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
-					return OPERATOR_FINISHED;
-				}
-				break;
-			case MOUSEMOVE:
-				if (!has_numinput) {
-					float dx;
-
-					dx = BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
-
-					if (event->x != mm->evtx) {   /* XXX maybe init for first time */
-						float fac;
-
-						mm->evtx = event->x;
-						fac = ((float)(event->x - mm->firstx) * dx);
-
-						apply_keyb_grid(event->shift, event->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
-
-						RNA_int_set(op->ptr, "frames", (int)fac);
-						ed_marker_move_apply(C, op);
-						ed_marker_move_update_header(C, op);
-					}
-				}
-				break;
-		}
-
-		if (!handled && event->val == KM_PRESS && handleNumInput(C, &mm->num, event)) {
-			float value = (float)RNA_int_get(op->ptr, "frames");
-
-			applyNumInput(&mm->num, &value);
-			if (use_time) {
-				value = TIME2FRA(value);
-			}
-
-			RNA_int_set(op->ptr, "frames", (int)value);
-			ed_marker_move_apply(C, op);
-			ed_marker_move_update_header(C, op);
-		}
-	}
-
-	return OPERATOR_RUNNING_MODAL;
+  Scene *scene = CTX_data_scene(C);
+  MarkerMove *mm = op->customdata;
+  View2D *v2d = UI_view2d_fromcontext(C);
+  const bool has_numinput = hasNumInput(&mm->num);
+  const bool use_time = ed_marker_move_use_time(mm);
+
+  /* Modal numinput active, try to handle numeric inputs first... */
+  if (event->val == KM_PRESS && has_numinput && handleNumInput(C, &mm->num, event)) {
+    float value = (float)RNA_int_get(op->ptr, "frames");
+
+    applyNumInput(&mm->num, &value);
+    if (use_time) {
+      value = TIME2FRA(value);
+    }
+
+    RNA_int_set(op->ptr, "frames", (int)value);
+    ed_marker_move_apply(C, op);
+    ed_marker_move_update_header(C, op);
+  }
+  else {
+    bool handled = false;
+    switch (event->type) {
+      case ESCKEY:
+        ed_marker_move_cancel(C, op);
+        return OPERATOR_CANCELLED;
+      case RIGHTMOUSE:
+        /* press = user manually demands transform to be canceled */
+        if (event->val == KM_PRESS) {
+          ed_marker_move_cancel(C, op);
+          return OPERATOR_CANCELLED;
+        }
+        /* else continue; <--- see if release event should be caught for tweak-end */
+        ATTR_FALLTHROUGH;
+
+      case RETKEY:
+      case PADENTER:
+      case LEFTMOUSE:
+      case MIDDLEMOUSE:
+        if (WM_event_is_modal_tweak_exit(event, mm->event_type)) {
+          ed_marker_move_exit(C, op);
+          WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+          WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+          return OPERATOR_FINISHED;
+        }
+        break;
+      case MOUSEMOVE:
+        if (!has_numinput) {
+          float dx;
+
+          dx = BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
+
+          if (event->x != mm->evtx) { /* XXX maybe init for first time */
+            float fac;
+
+            mm->evtx = event->x;
+            fac = ((float)(event->x - mm->firstx) * dx);
+
+            apply_keyb_grid(event->shift,
+                            event->ctrl,
+                            &fac,
+                            0.0,
+                            1.0,
+                            0.1,
+                            0 /*was: U.flag & USER_AUTOGRABGRID*/);
+
+            RNA_int_set(op->ptr, "frames", (int)fac);
+            ed_marker_move_apply(C, op);
+            ed_marker_move_update_header(C, op);
+          }
+        }
+        break;
+    }
+
+    if (!handled && event->val == KM_PRESS && handleNumInput(C, &mm->num, event)) {
+      float value = (float)RNA_int_get(op->ptr, "frames");
+
+      applyNumInput(&mm->num, &value);
+      if (use_time) {
+        value = TIME2FRA(value);
+      }
+
+      RNA_int_set(op->ptr, "frames", (int)value);
+      ed_marker_move_apply(C, op);
+      ed_marker_move_update_header(C, op);
+    }
+  }
+
+  return OPERATOR_RUNNING_MODAL;
 }
 
 static int ed_marker_move_exec(bContext *C, wmOperator *op)
 {
-	if (ed_marker_move_init(C, op)) {
-		ed_marker_move_apply(C, op);
-		ed_marker_move_exit(C, op);
-		return OPERATOR_FINISHED;
-	}
-	return OPERATOR_PASS_THROUGH;
+  if (ed_marker_move_init(C, op)) {
+    ed_marker_move_apply(C, op);
+    ed_marker_move_exit(C, op);
+    return OPERATOR_FINISHED;
+  }
+  return OPERATOR_PASS_THROUGH;
 }
 
 static void MARKER_OT_move(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Move Time Marker";
-	ot->description = "Move selected time marker(s)";
-	ot->idname = "MARKER_OT_move";
-
-	/* api callbacks */
-	ot->exec = ed_marker_move_exec;
-	ot->invoke = ed_marker_move_invoke_wrapper;
-	ot->modal = ed_marker_move_modal;
-	ot->poll = ed_markers_poll_selected_no_locked_markers;
-	ot->cancel = ed_marker_move_cancel;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING | OPTYPE_GRAB_CURSOR;
-
-	/* rna storage */
-	RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX);
+  /* identifiers */
+  ot->name = "Move Time Marker";
+  ot->description = "Move selected time marker(s)";
+  ot->idname = "MARKER_OT_move";
+
+  /* api callbacks */
+  ot->exec = ed_marker_move_exec;
+  ot->invoke = ed_marker_move_invoke_wrapper;
+  ot->modal = ed_marker_move_modal;
+  ot->poll = ed_markers_poll_selected_no_locked_markers;
+  ot->cancel = ed_marker_move_cancel;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING | OPTYPE_GRAB_CURSOR;
+
+  /* rna storage */
+  RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX);
 }
 
 /* ************************** duplicate markers *************************** */
@@ -1065,76 +1076,75 @@ static void MARKER_OT_move(wmOperatorType *ot)
 /* duplicate selected TimeMarkers */
 static void ed_marker_duplicate_apply(bContext *C)
 {
-	ListBase *markers = ED_context_get_markers(C);
-	TimeMarker *marker, *newmarker;
-
-	if (markers == NULL)
-		return;
-
-	/* go through the list of markers, duplicate selected markers and add duplicated copies
-	 * to the beginning of the list (unselect original markers)
-	 */
-	for (marker = markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			/* unselect selected marker */
-			marker->flag &= ~SELECT;
-
-			/* create and set up new marker */
-			newmarker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
-			newmarker->flag = SELECT;
-			newmarker->frame = marker->frame;
-			BLI_strncpy(newmarker->name, marker->name, sizeof(marker->name));
+  ListBase *markers = ED_context_get_markers(C);
+  TimeMarker *marker, *newmarker;
+
+  if (markers == NULL)
+    return;
+
+  /* go through the list of markers, duplicate selected markers and add duplicated copies
+   * to the beginning of the list (unselect original markers)
+   */
+  for (marker = markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      /* unselect selected marker */
+      marker->flag &= ~SELECT;
+
+      /* create and set up new marker */
+      newmarker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
+      newmarker->flag = SELECT;
+      newmarker->frame = marker->frame;
+      BLI_strncpy(newmarker->name, marker->name, sizeof(marker->name));
 
 #ifdef DURIAN_CAMERA_SWITCH
-			newmarker->camera = marker->camera;
+      newmarker->camera = marker->camera;
 #endif
 
-			/* new marker is added to the beginning of list */
-			// FIXME: bad ordering!
-			BLI_addhead(markers, newmarker);
-		}
-	}
+      /* new marker is added to the beginning of list */
+      // FIXME: bad ordering!
+      BLI_addhead(markers, newmarker);
+    }
+  }
 }
 
 static int ed_marker_duplicate_exec(bContext *C, wmOperator *op)
 {
-	ed_marker_duplicate_apply(C);
-	ed_marker_move_exec(C, op); /* assumes frs delta set */
-
-	return OPERATOR_FINISHED;
+  ed_marker_duplicate_apply(C);
+  ed_marker_move_exec(C, op); /* assumes frs delta set */
 
+  return OPERATOR_FINISHED;
 }
 
 static int ed_marker_duplicate_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	ed_marker_duplicate_apply(C);
-	return ed_marker_move_invoke(C, op, event);
+  ed_marker_duplicate_apply(C);
+  return ed_marker_move_invoke(C, op, event);
 }
 
 static int ed_marker_duplicate_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_duplicate_invoke);
+  return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_duplicate_invoke);
 }
 
 static void MARKER_OT_duplicate(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Duplicate Time Marker";
-	ot->description = "Duplicate selected time marker(s)";
-	ot->idname = "MARKER_OT_duplicate";
-
-	/* api callbacks */
-	ot->exec = ed_marker_duplicate_exec;
-	ot->invoke = ed_marker_duplicate_invoke_wrapper;
-	ot->modal = ed_marker_move_modal;
-	ot->poll = ed_markers_poll_selected_no_locked_markers;
-	ot->cancel = ed_marker_move_cancel;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* rna storage */
-	RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX);
+  /* identifiers */
+  ot->name = "Duplicate Time Marker";
+  ot->description = "Duplicate selected time marker(s)";
+  ot->idname = "MARKER_OT_duplicate";
+
+  /* api callbacks */
+  ot->exec = ed_marker_duplicate_exec;
+  ot->invoke = ed_marker_duplicate_invoke_wrapper;
+  ot->modal = ed_marker_move_modal;
+  ot->poll = ed_markers_poll_selected_no_locked_markers;
+  ot->cancel = ed_marker_move_cancel;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* rna storage */
+  RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX);
 }
 
 /* ************************** selection ************************************/
@@ -1142,137 +1152,136 @@ static void MARKER_OT_duplicate(wmOperatorType *ot)
 /* select/deselect TimeMarker at current frame */
 static void select_timeline_marker_frame(ListBase *markers, int frame, bool extend)
 {
-	TimeMarker *marker, *marker_first = NULL;
-
-	/* support for selection cycling */
-	for (marker = markers->first; marker; marker = marker->next) {
-		if (marker->frame == frame) {
-			if (marker->flag & SELECT) {
-				marker_first = marker->next;
-				break;
-			}
-		}
-	}
-
-	/* if extend is not set, then deselect markers */
-	if (extend == false) {
-		for (marker = markers->first; marker; marker = marker->next) {
-			marker->flag &= ~SELECT;
-		}
-	}
-
-	LISTBASE_CIRCULAR_FORWARD_BEGIN(markers, marker, marker_first)
-	{
-		/* this way a not-extend select will always give 1 selected marker */
-		if (marker->frame == frame) {
-			marker->flag ^= SELECT;
-			break;
-		}
-	}
-	LISTBASE_CIRCULAR_FORWARD_END(markers, marker, marker_first);
+  TimeMarker *marker, *marker_first = NULL;
+
+  /* support for selection cycling */
+  for (marker = markers->first; marker; marker = marker->next) {
+    if (marker->frame == frame) {
+      if (marker->flag & SELECT) {
+        marker_first = marker->next;
+        break;
+      }
+    }
+  }
+
+  /* if extend is not set, then deselect markers */
+  if (extend == false) {
+    for (marker = markers->first; marker; marker = marker->next) {
+      marker->flag &= ~SELECT;
+    }
+  }
+
+  LISTBASE_CIRCULAR_FORWARD_BEGIN (markers, marker, marker_first) {
+    /* this way a not-extend select will always give 1 selected marker */
+    if (marker->frame == frame) {
+      marker->flag ^= SELECT;
+      break;
+    }
+  }
+  LISTBASE_CIRCULAR_FORWARD_END(markers, marker, marker_first);
 }
 
 static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool camera)
 {
-	ListBase *markers = ED_context_get_markers(C);
-	ARegion *ar = CTX_wm_region(C);
-	View2D *v2d = UI_view2d_fromcontext(C);
-	float viewx;
-	int x, cfra;
+  ListBase *markers = ED_context_get_markers(C);
+  ARegion *ar = CTX_wm_region(C);
+  View2D *v2d = UI_view2d_fromcontext(C);
+  float viewx;
+  int x, cfra;
 
-	if (markers == NULL)
-		return OPERATOR_PASS_THROUGH;
+  if (markers == NULL)
+    return OPERATOR_PASS_THROUGH;
 
-	x = event->x - ar->winrct.xmin;
+  x = event->x - ar->winrct.xmin;
 
-	viewx = UI_view2d_region_to_view_x(v2d, x);
+  viewx = UI_view2d_region_to_view_x(v2d, x);
 
-	cfra = ED_markers_find_nearest_marker_time(markers, viewx);
+  cfra = ED_markers_find_nearest_marker_time(markers, viewx);
 
-	select_timeline_marker_frame(markers, cfra, extend);
+  select_timeline_marker_frame(markers, cfra, extend);
 
 #ifdef DURIAN_CAMERA_SWITCH
 
-	if (camera) {
-		Scene *scene = CTX_data_scene(C);
-		ViewLayer *view_layer = CTX_data_view_layer(C);
-		Base *base;
-		TimeMarker *marker;
-		int sel = 0;
-
-		if (!extend)
-			BKE_view_layer_base_deselect_all(view_layer);
-
-		for (marker = markers->first; marker; marker = marker->next) {
-			if (marker->frame == cfra) {
-				sel = (marker->flag & SELECT);
-				break;
-			}
-		}
-
-		for (marker = markers->first; marker; marker = marker->next) {
-			if (marker->camera) {
-				if (marker->frame == cfra) {
-					base = BKE_view_layer_base_find(view_layer, marker->camera);
-					if (base) {
-						ED_object_base_select(base, sel);
-						if (sel)
-							ED_object_base_activate(C, base);
-					}
-				}
-			}
-		}
-
-		DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-	}
+  if (camera) {
+    Scene *scene = CTX_data_scene(C);
+    ViewLayer *view_layer = CTX_data_view_layer(C);
+    Base *base;
+    TimeMarker *marker;
+    int sel = 0;
+
+    if (!extend)
+      BKE_view_layer_base_deselect_all(view_layer);
+
+    for (marker = markers->first; marker; marker = marker->next) {
+      if (marker->frame == cfra) {
+        sel = (marker->flag & SELECT);
+        break;
+      }
+    }
+
+    for (marker = markers->first; marker; marker = marker->next) {
+      if (marker->camera) {
+        if (marker->frame == cfra) {
+          base = BKE_view_layer_base_find(view_layer, marker->camera);
+          if (base) {
+            ED_object_base_select(base, sel);
+            if (sel)
+              ED_object_base_activate(C, base);
+          }
+        }
+      }
+    }
+
+    DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
+    WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+  }
 #else
-	(void)camera;
+  (void)camera;
 #endif
 
-	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
 
-	/* allowing tweaks, but needs OPERATOR_FINISHED, otherwise renaming fails... [#25987] */
-	return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
+  /* allowing tweaks, but needs OPERATOR_FINISHED, otherwise renaming fails... [#25987] */
+  return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
 }
 
 static int ed_marker_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	const bool extend = RNA_boolean_get(op->ptr, "extend");
-	bool camera = false;
+  const bool extend = RNA_boolean_get(op->ptr, "extend");
+  bool camera = false;
 #ifdef DURIAN_CAMERA_SWITCH
-	camera = RNA_boolean_get(op->ptr, "camera");
+  camera = RNA_boolean_get(op->ptr, "camera");
 #endif
-	return ed_marker_select(C, event, extend, camera);
+  return ed_marker_select(C, event, extend, camera);
 }
 
 static int ed_marker_select_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_select_invoke);
+  return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_select_invoke);
 }
 
 static void MARKER_OT_select(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
+  PropertyRNA *prop;
 
-	/* identifiers */
-	ot->name = "Select Time Marker";
-	ot->description = "Select time marker(s)";
-	ot->idname = "MARKER_OT_select";
+  /* identifiers */
+  ot->name = "Select Time Marker";
+  ot->description = "Select time marker(s)";
+  ot->idname = "MARKER_OT_select";
 
-	/* api callbacks */
-	ot->invoke = ed_marker_select_invoke_wrapper;
-	ot->poll = ed_markers_poll_markers_exist;
+  /* api callbacks */
+  ot->invoke = ed_marker_select_invoke_wrapper;
+  ot->poll = ed_markers_poll_markers_exist;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+  prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection");
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 #ifdef DURIAN_CAMERA_SWITCH
-	prop = RNA_def_boolean(ot->srna, "camera", 0, "Camera", "Select the camera");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+  prop = RNA_def_boolean(ot->srna, "camera", 0, "Camera", "Select the camera");
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 #endif
 }
 
@@ -1286,110 +1295,110 @@ static void MARKER_OT_select(wmOperatorType *ot)
  *
  * callbacks:
  *
- *  exec()	has to be filled in by user
+ *  exec()  has to be filled in by user
  *
  *  invoke() default WM function
  *          adds modal handler
  *
- *  modal()	default WM function
+ *  modal() default WM function
  *          accept modal events while doing it, calls exec(), handles ESC and border drawing
  *
- *  poll()	has to be filled in by user for context
+ *  poll()  has to be filled in by user for context
  */
 
 static int ed_marker_box_select_exec(bContext *C, wmOperator *op)
 {
-	View2D *v2d = UI_view2d_fromcontext(C);
-	ListBase *markers = ED_context_get_markers(C);
-	rctf rect;
+  View2D *v2d = UI_view2d_fromcontext(C);
+  ListBase *markers = ED_context_get_markers(C);
+  rctf rect;
 
-	WM_operator_properties_border_to_rctf(op, &rect);
-	UI_view2d_region_to_view_rctf(v2d, &rect, &rect);
+  WM_operator_properties_border_to_rctf(op, &rect);
+  UI_view2d_region_to_view_rctf(v2d, &rect, &rect);
 
-	if (markers == NULL)
-		return 0;
+  if (markers == NULL)
+    return 0;
 
-	const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
-	const bool select = (sel_op != SEL_OP_SUB);
-	if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
-		ED_markers_deselect_all(markers, SEL_DESELECT);
-	}
+  const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
+  const bool select = (sel_op != SEL_OP_SUB);
+  if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
+    ED_markers_deselect_all(markers, SEL_DESELECT);
+  }
 
-	for (TimeMarker *marker = markers->first; marker; marker = marker->next) {
-		if (BLI_rctf_isect_x(&rect, marker->frame)) {
-			SET_FLAG_FROM_TEST(marker->flag, select, SELECT);
-		}
-	}
+  for (TimeMarker *marker = markers->first; marker; marker = marker->next) {
+    if (BLI_rctf_isect_x(&rect, marker->frame)) {
+      SET_FLAG_FROM_TEST(marker->flag, select, SELECT);
+    }
+  }
 
-	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
 
-	return 1;
+  return 1;
 }
 
 static int ed_marker_select_box_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	return ed_markers_opwrap_invoke_custom(C, op, event, WM_gesture_box_invoke);
+  return ed_markers_opwrap_invoke_custom(C, op, event, WM_gesture_box_invoke);
 }
 
 static void MARKER_OT_select_box(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Marker Box Select";
-	ot->description = "Select all time markers using box selection";
-	ot->idname = "MARKER_OT_select_box";
+  /* identifiers */
+  ot->name = "Marker Box Select";
+  ot->description = "Select all time markers using box selection";
+  ot->idname = "MARKER_OT_select_box";
 
-	/* api callbacks */
-	ot->exec = ed_marker_box_select_exec;
-	ot->invoke = ed_marker_select_box_invoke_wrapper;
-	ot->modal = WM_gesture_box_modal;
-	ot->cancel = WM_gesture_box_cancel;
+  /* api callbacks */
+  ot->exec = ed_marker_box_select_exec;
+  ot->invoke = ed_marker_select_box_invoke_wrapper;
+  ot->modal = WM_gesture_box_modal;
+  ot->cancel = WM_gesture_box_cancel;
 
-	ot->poll = ed_markers_poll_markers_exist;
+  ot->poll = ed_markers_poll_markers_exist;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	/* properties */
-	WM_operator_properties_gesture_box(ot);
-	WM_operator_properties_select_operation_simple(ot);
+  /* properties */
+  WM_operator_properties_gesture_box(ot);
+  WM_operator_properties_select_operation_simple(ot);
 }
 
 /* *********************** (de)select all ***************** */
 
 static int ed_marker_select_all_exec(bContext *C, wmOperator *op)
 {
-	ListBase *markers = ED_context_get_markers(C);
-	if (markers == NULL) {
-		return OPERATOR_CANCELLED;
-	}
+  ListBase *markers = ED_context_get_markers(C);
+  if (markers == NULL) {
+    return OPERATOR_CANCELLED;
+  }
 
-	int action = RNA_enum_get(op->ptr, "action");
-	ED_markers_deselect_all(markers, action);
+  int action = RNA_enum_get(op->ptr, "action");
+  ED_markers_deselect_all(markers, action);
 
-	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 static void MARKER_OT_select_all(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "(De)select all Markers";
-	ot->description = "Change selection of all time markers";
-	ot->idname = "MARKER_OT_select_all";
+  /* identifiers */
+  ot->name = "(De)select all Markers";
+  ot->description = "Change selection of all time markers";
+  ot->idname = "MARKER_OT_select_all";
 
-	/* api callbacks */
-	ot->exec = ed_marker_select_all_exec;
-	ot->invoke = ed_markers_opwrap_invoke;
-	ot->poll = ed_markers_poll_markers_exist;
+  /* api callbacks */
+  ot->exec = ed_marker_select_all_exec;
+  ot->invoke = ed_markers_opwrap_invoke;
+  ot->poll = ed_markers_poll_markers_exist;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	/* rna */
-	WM_operator_properties_select_all(ot);
+  /* rna */
+  WM_operator_properties_select_all(ot);
 }
 
 /* ***************** remove marker *********************** */
@@ -1397,167 +1406,172 @@ static void MARKER_OT_select_all(wmOperatorType *ot)
 /* remove selected TimeMarkers */
 static int ed_marker_delete_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	ListBase *markers = ED_context_get_markers(C);
-	TimeMarker *marker, *nmarker;
-	bool changed = false;
-
-	if (markers == NULL)
-		return OPERATOR_CANCELLED;
-
-	for (marker = markers->first; marker; marker = nmarker) {
-		nmarker = marker->next;
-		if (marker->flag & SELECT) {
-			BLI_freelinkN(markers, marker);
-			changed = true;
-		}
-	}
-
-	if (changed) {
-		WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-		WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
-	}
-
-	return OPERATOR_FINISHED;
+  ListBase *markers = ED_context_get_markers(C);
+  TimeMarker *marker, *nmarker;
+  bool changed = false;
+
+  if (markers == NULL)
+    return OPERATOR_CANCELLED;
+
+  for (marker = markers->first; marker; marker = nmarker) {
+    nmarker = marker->next;
+    if (marker->flag & SELECT) {
+      BLI_freelinkN(markers, marker);
+      changed = true;
+    }
+  }
+
+  if (changed) {
+    WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+    WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+  }
+
+  return OPERATOR_FINISHED;
 }
 
 static int ed_marker_delete_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	// XXX: must we keep these confirmations?
-	return ed_markers_opwrap_invoke_custom(C, op, event, WM_operator_confirm);
+  // XXX: must we keep these confirmations?
+  return ed_markers_opwrap_invoke_custom(C, op, event, WM_operator_confirm);
 }
 
 static void MARKER_OT_delete(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Delete Markers";
-	ot->description = "Delete selected time marker(s)";
-	ot->idname = "MARKER_OT_delete";
-
-	/* api callbacks */
-	ot->invoke = ed_marker_delete_invoke_wrapper;
-	ot->exec = ed_marker_delete_exec;
-	ot->poll = ed_markers_poll_selected_no_locked_markers;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* identifiers */
+  ot->name = "Delete Markers";
+  ot->description = "Delete selected time marker(s)";
+  ot->idname = "MARKER_OT_delete";
+
+  /* api callbacks */
+  ot->invoke = ed_marker_delete_invoke_wrapper;
+  ot->exec = ed_marker_delete_exec;
+  ot->poll = ed_markers_poll_selected_no_locked_markers;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-
 /* **************** rename marker ***************** */
 
 /* rename first selected TimeMarker */
 static int ed_marker_rename_exec(bContext *C, wmOperator *op)
 {
-	TimeMarker *marker = ED_markers_get_first_selected(ED_context_get_markers(C));
+  TimeMarker *marker = ED_markers_get_first_selected(ED_context_get_markers(C));
 
-	if (marker) {
-		RNA_string_get(op->ptr, "name", marker->name);
+  if (marker) {
+    RNA_string_get(op->ptr, "name", marker->name);
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-		WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+    WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+    WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
 
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+    return OPERATOR_FINISHED;
+  }
+  else {
+    return OPERATOR_CANCELLED;
+  }
 }
 
 static int ed_marker_rename_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	/* must initialize the marker name first if there is a marker selected */
-	TimeMarker *marker = ED_markers_get_first_selected(ED_context_get_markers(C));
-	if (marker)
-		RNA_string_set(op->ptr, "name", marker->name);
+  /* must initialize the marker name first if there is a marker selected */
+  TimeMarker *marker = ED_markers_get_first_selected(ED_context_get_markers(C));
+  if (marker)
+    RNA_string_set(op->ptr, "name", marker->name);
 
-	/* now see if the operator is usable */
-	return ed_markers_opwrap_invoke_custom(C, op, event, WM_operator_props_popup_confirm);
+  /* now see if the operator is usable */
+  return ed_markers_opwrap_invoke_custom(C, op, event, WM_operator_props_popup_confirm);
 }
 
 static void MARKER_OT_rename(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Rename Marker";
-	ot->description = "Rename first selected time marker";
-	ot->idname = "MARKER_OT_rename";
-
-	/* api callbacks */
-	ot->invoke = ed_marker_rename_invoke_wrapper;
-	ot->exec = ed_marker_rename_exec;
-	ot->poll = ed_markers_poll_selected_no_locked_markers;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), "Name", "New name for marker");
-	//RNA_def_boolean(ot->srna, "ensure_unique", 0, "Ensure Unique", "Ensure that new name is unique within collection of markers");
+  /* identifiers */
+  ot->name = "Rename Marker";
+  ot->description = "Rename first selected time marker";
+  ot->idname = "MARKER_OT_rename";
+
+  /* api callbacks */
+  ot->invoke = ed_marker_rename_invoke_wrapper;
+  ot->exec = ed_marker_rename_exec;
+  ot->poll = ed_markers_poll_selected_no_locked_markers;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* properties */
+  ot->prop = RNA_def_string(ot->srna,
+                            "name",
+                            "RenamedMarker",
+                            sizeof(((TimeMarker *)NULL)->name),
+                            "Name",
+                            "New name for marker");
+  //RNA_def_boolean(ot->srna, "ensure_unique", 0, "Ensure Unique", "Ensure that new name is unique within collection of markers");
 }
 
 /* **************** make links to scene ***************** */
 
 static int ed_marker_make_links_scene_exec(bContext *C, wmOperator *op)
 {
-	ListBase *markers = ED_context_get_markers(C);
-	Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scenes, RNA_enum_get(op->ptr, "scene"));
-	TimeMarker *marker, *marker_new;
-
-	if (scene_to == NULL) {
-		BKE_report(op->reports, RPT_ERROR, "Scene not found");
-		return OPERATOR_CANCELLED;
-	}
-
-	if (scene_to == CTX_data_scene(C)) {
-		BKE_report(op->reports, RPT_ERROR, "Cannot re-link markers into the same scene");
-		return OPERATOR_CANCELLED;
-	}
-
-	if (scene_to->toolsettings->lock_markers) {
-		BKE_report(op->reports, RPT_ERROR, "Target scene has locked markers");
-		return OPERATOR_CANCELLED;
-	}
-
-	/* copy markers */
-	for (marker = markers->first; marker; marker = marker->next) {
-		if (marker->flag & SELECT) {
-			marker_new = MEM_dupallocN(marker);
-			marker_new->prev = marker_new->next = NULL;
-
-			BLI_addtail(&scene_to->markers, marker_new);
-		}
-	}
-
-	return OPERATOR_FINISHED;
+  ListBase *markers = ED_context_get_markers(C);
+  Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scenes, RNA_enum_get(op->ptr, "scene"));
+  TimeMarker *marker, *marker_new;
+
+  if (scene_to == NULL) {
+    BKE_report(op->reports, RPT_ERROR, "Scene not found");
+    return OPERATOR_CANCELLED;
+  }
+
+  if (scene_to == CTX_data_scene(C)) {
+    BKE_report(op->reports, RPT_ERROR, "Cannot re-link markers into the same scene");
+    return OPERATOR_CANCELLED;
+  }
+
+  if (scene_to->toolsettings->lock_markers) {
+    BKE_report(op->reports, RPT_ERROR, "Target scene has locked markers");
+    return OPERATOR_CANCELLED;
+  }
+
+  /* copy markers */
+  for (marker = markers->first; marker; marker = marker->next) {
+    if (marker->flag & SELECT) {
+      marker_new = MEM_dupallocN(marker);
+      marker_new->prev = marker_new->next = NULL;
+
+      BLI_addtail(&scene_to->markers, marker_new);
+    }
+  }
+
+  return OPERATOR_FINISHED;
 }
 
-static int ed_marker_make_links_scene_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
+static int ed_marker_make_links_scene_invoke_wrapper(bContext *C,
+                                                     wmOperator *op,
+                                                     const wmEvent *event)
 {
-	return ed_markers_opwrap_invoke_custom(C, op, event, WM_menu_invoke);
+  return ed_markers_opwrap_invoke_custom(C, op, event, WM_menu_invoke);
 }
 
 static void MARKER_OT_make_links_scene(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "Make Links to Scene";
-	ot->description = "Copy selected markers to another scene";
-	ot->idname = "MARKER_OT_make_links_scene";
-
-	/* api callbacks */
-	ot->exec = ed_marker_make_links_scene_exec;
-	ot->invoke = ed_marker_make_links_scene_invoke_wrapper;
-	ot->poll = ed_markers_poll_selected_markers;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", "");
-	RNA_def_enum_funcs(prop, RNA_scene_itemf);
-	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
-	ot->prop = prop;
-
+  PropertyRNA *prop;
+
+  /* identifiers */
+  ot->name = "Make Links to Scene";
+  ot->description = "Copy selected markers to another scene";
+  ot->idname = "MARKER_OT_make_links_scene";
+
+  /* api callbacks */
+  ot->exec = ed_marker_make_links_scene_exec;
+  ot->invoke = ed_marker_make_links_scene_invoke_wrapper;
+  ot->poll = ed_markers_poll_selected_markers;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* properties */
+  prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", "");
+  RNA_def_enum_funcs(prop, RNA_scene_itemf);
+  RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
+  ot->prop = prop;
 }
 
 #ifdef DURIAN_CAMERA_SWITCH
@@ -1565,65 +1579,65 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot)
 
 static int ed_marker_camera_bind_exec(bContext *C, wmOperator *op)
 {
-	bScreen *sc = CTX_wm_screen(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = CTX_data_active_object(C);
-	ListBase *markers = ED_context_get_markers(C);
-	TimeMarker *marker;
-
-	/* Don't do anything if we don't have a camera selected */
-	if (ob == NULL) {
-		BKE_report(op->reports, RPT_ERROR, "Select a camera to bind to a marker on this frame");
-		return OPERATOR_CANCELLED;
-	}
-
-	/* add new marker, unless we already have one on this frame, in which case, replace it */
-	if (markers == NULL)
-		return OPERATOR_CANCELLED;
-
-	marker = ED_markers_find_nearest_marker(markers, CFRA);
-	if ((marker == NULL) || (marker->frame != CFRA)) {
-		marker = MEM_callocN(sizeof(TimeMarker), "Camera TimeMarker");
-		marker->flag = SELECT;
-		marker->frame = CFRA;
-		BLI_addtail(markers, marker);
-
-		/* deselect all others, so that the user can then move it without problems */
-		for (TimeMarker *m = markers->first; m; m = m->next) {
-			if (m != marker) {
-				m->flag &= ~SELECT;
-			}
-		}
-	}
-
-	/* bind to the nominated camera (as set in operator props) */
-	marker->camera = ob;
-
-	/* camera may have changes */
-	BKE_scene_camera_switch_update(scene);
-	BKE_screen_view3d_scene_sync(sc, scene);
-
-	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
-	WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene); /* so we get view3d redraws */
-
-	return OPERATOR_FINISHED;
+  bScreen *sc = CTX_wm_screen(C);
+  Scene *scene = CTX_data_scene(C);
+  Object *ob = CTX_data_active_object(C);
+  ListBase *markers = ED_context_get_markers(C);
+  TimeMarker *marker;
+
+  /* Don't do anything if we don't have a camera selected */
+  if (ob == NULL) {
+    BKE_report(op->reports, RPT_ERROR, "Select a camera to bind to a marker on this frame");
+    return OPERATOR_CANCELLED;
+  }
+
+  /* add new marker, unless we already have one on this frame, in which case, replace it */
+  if (markers == NULL)
+    return OPERATOR_CANCELLED;
+
+  marker = ED_markers_find_nearest_marker(markers, CFRA);
+  if ((marker == NULL) || (marker->frame != CFRA)) {
+    marker = MEM_callocN(sizeof(TimeMarker), "Camera TimeMarker");
+    marker->flag = SELECT;
+    marker->frame = CFRA;
+    BLI_addtail(markers, marker);
+
+    /* deselect all others, so that the user can then move it without problems */
+    for (TimeMarker *m = markers->first; m; m = m->next) {
+      if (m != marker) {
+        m->flag &= ~SELECT;
+      }
+    }
+  }
+
+  /* bind to the nominated camera (as set in operator props) */
+  marker->camera = ob;
+
+  /* camera may have changes */
+  BKE_scene_camera_switch_update(scene);
+  BKE_screen_view3d_scene_sync(sc, scene);
+
+  WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
+  WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene); /* so we get view3d redraws */
+
+  return OPERATOR_FINISHED;
 }
 
 static void MARKER_OT_camera_bind(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Bind Camera to Markers";
-	ot->description = "Bind the selected camera to a marker on the current frame";
-	ot->idname = "MARKER_OT_camera_bind";
-
-	/* api callbacks */
-	ot->exec = ed_marker_camera_bind_exec;
-	ot->invoke = ed_markers_opwrap_invoke;
-	ot->poll = ED_operator_animview_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* identifiers */
+  ot->name = "Bind Camera to Markers";
+  ot->description = "Bind the selected camera to a marker on the current frame";
+  ot->idname = "MARKER_OT_camera_bind";
+
+  /* api callbacks */
+  ot->exec = ed_marker_camera_bind_exec;
+  ot->invoke = ed_markers_opwrap_invoke;
+  ot->poll = ED_operator_animview_active;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 #endif
 
@@ -1632,22 +1646,22 @@ static void MARKER_OT_camera_bind(wmOperatorType *ot)
 /* called in screen_ops.c:ED_operatortypes_screen() */
 void ED_operatortypes_marker(void)
 {
-	WM_operatortype_append(MARKER_OT_add);
-	WM_operatortype_append(MARKER_OT_move);
-	WM_operatortype_append(MARKER_OT_duplicate);
-	WM_operatortype_append(MARKER_OT_select);
-	WM_operatortype_append(MARKER_OT_select_box);
-	WM_operatortype_append(MARKER_OT_select_all);
-	WM_operatortype_append(MARKER_OT_delete);
-	WM_operatortype_append(MARKER_OT_rename);
-	WM_operatortype_append(MARKER_OT_make_links_scene);
+  WM_operatortype_append(MARKER_OT_add);
+  WM_operatortype_append(MARKER_OT_move);
+  WM_operatortype_append(MARKER_OT_duplicate);
+  WM_operatortype_append(MARKER_OT_select);
+  WM_operatortype_append(MARKER_OT_select_box);
+  WM_operatortype_append(MARKER_OT_select_all);
+  WM_operatortype_append(MARKER_OT_delete);
+  WM_operatortype_append(MARKER_OT_rename);
+  WM_operatortype_append(MARKER_OT_make_links_scene);
 #ifdef DURIAN_CAMERA_SWITCH
-	WM_operatortype_append(MARKER_OT_camera_bind);
+  WM_operatortype_append(MARKER_OT_camera_bind);
 #endif
 }
 
 /* called in screen_ops.c:ED_keymap_screen() */
 void ED_keymap_marker(wmKeyConfig *keyconf)
 {
-	WM_keymap_ensure(keyconf, "Markers", 0, 0);
+  WM_keymap_ensure(keyconf, "Markers", 0, 0);
 }