[Bf-blender-cvs] [c371d699cab] blender-v2.92-release: Fix T84784: Time Remapping not displaying in the timeline

[Philipp Oeser]

Commit: c371d699cabcc4ee7690b0f74968354064c7dc7d
Author: Philipp Oeser
Date:   Mon Jan 18 12:02:45 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rBc371d699cabcc4ee7690b0f74968354064c7dc7d

Fix T84784: Time Remapping not displaying in the timeline

Caused by rBbbb2e0614fc3.

Oversight to not take the remapped framelength into account.

Maniphest Tasks: T84784

Differential Revision: https://developer.blender.org/D10134

===================================================================

M	source/blender/editors/animation/time_scrub_ui.c

===================================================================

diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c
index acbac93b654..4e0542dc1e4 100644
--- a/source/blender/editors/animation/time_scrub_ui.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -22,6 +22,7 @@
  */
 
 #include "BKE_context.h"
+#include "BKE_scene.h"
 
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
@@ -91,7 +92,6 @@ static void draw_current_frame(const Scene *scene,
                                const View2D *v2d,
                                const rcti *scrub_region_rect,
                                int current_frame,
-                               float sub_frame,
                                bool draw_line)
 {
   const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
@@ -109,7 +109,7 @@ static void draw_current_frame(const Scene *scene,
   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, current_frame + sub_frame);
+    const float subframe_x = UI_view2d_view_to_region_x(v2d, BKE_scene_frame_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);
@@ -168,7 +168,6 @@ void ED_time_scrub_draw_current_frame(const ARegion *region,
                      v2d,
                      &scrub_region_rect,
                      scene->r.cfra,
-                     scene->r.subframe,
                      draw_line);
   GPU_matrix_pop_projection();
 }