[Bf-blender-cvs] [b888711e50e] master: Fix T72443: Support time remapping for camera-markers

[Campbell Barton]

Commit: b888711e50e428c9b1d1744d2775fd4d95ddcb1e
Author: Campbell Barton
Date:   Mon Dec 23 17:28:15 2019 +1100
Branches: master
https://developer.blender.org/rBb888711e50e428c9b1d1744d2775fd4d95ddcb1e

Fix T72443: Support time remapping for camera-markers

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index ab72b7d3b0d..f84ef92d074 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -982,14 +982,16 @@ Object *BKE_scene_camera_switch_find(Scene *scene)
     return NULL;
   }
 
-  TimeMarker *m;
-  int cfra = scene->r.cfra;
+  const int cfra = ((scene->r.images == scene->r.framapto) ?
+                        scene->r.cfra :
+                        (int)(scene->r.cfra *
+                              ((float)scene->r.framapto / (float)scene->r.images)));
   int frame = -(MAXFRAME + 1);
   int min_frame = MAXFRAME + 1;
   Object *camera = NULL;
   Object *first_camera = NULL;
 
-  for (m = scene->markers.first; m; m = m->next) {
+  for (TimeMarker *m = scene->markers.first; m; m = m->next) {
     if (m->camera && (m->camera->restrictflag & OB_RESTRICT_RENDER) == 0) {
       if ((m->frame <= cfra) && (m->frame > frame)) {
         camera = m->camera;