Merge branch 'master' into temp-ui-tweaks

# Conflicts:
#	source/blender/editors/animation/time_scrub_ui.c

1 files changed, 0 insertions, 30 deletions

diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c
index 9b84209eb43..71502d2c9fa 100644
--- a/source/blender/editors/animation/time_scrub_ui.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -106,35 +106,6 @@ static void draw_current_frame(const Scene *scene,
   float bg_color[4];
   UI_GetThemeColorShade4fv(TH_CFRAME, -5, bg_color);
 
-<<<<<<< HEAD
-  if (draw_line) {
-    /* Draw vertical line to from the bottom of the current frame box to the bottom of the screen.
-     */
-    const float subframe_x = UI_view2d_view_to_region_x(v2d, BKE_scene_ctime_get(scene));
-    GPUVertFormat *format = immVertexFormat();
-    uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
-
-    immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-    GPU_blend(GPU_BLEND_ALPHA);
-
-    immUniformThemeColorShadeAlpha(TH_BACK, -25, -100);
-    immRectf(pos,
-             subframe_x - U.pixelsize - outline,
-             scrub_region_rect->ymax - box_padding,
-             subframe_x + U.pixelsize + outline,
-             0.0f);
-
-    immUniformThemeColor(TH_CFRAME);
-    immRectf(pos,
-             subframe_x - U.pixelsize,
-             scrub_region_rect->ymax - box_padding,
-             subframe_x + U.pixelsize,
-             0.0f);
-
-    GPU_blend(GPU_BLEND_NONE);
-    immUnbindProgram();
-  }
-=======
   /* Draw vertical line from the bottom of the current frame box to the bottom of the screen. */
   const float subframe_x = UI_view2d_view_to_region_x(v2d, BKE_scene_ctime_get(scene));
   GPUVertFormat *format = immVertexFormat();
@@ -147,7 +118,6 @@ static void draw_current_frame(const Scene *scene,
            subframe_x + U.pixelsize,
            0.0f);
   immUnbindProgram();
->>>>>>> master
 
   UI_draw_roundbox_corner_set(UI_CNR_ALL);