blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

Fix T72443: Support time remapping for camera-markers

This commit is contained in:
Campbell Barton 2019-12-23 17:28:15 +11:00
parent 6aa82d1686
commit b888711e50
Notes: blender-bot 2023-02-14 07:45:38 +01:00 
Referenced by issue #72443, Time Remapping not work with markers
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/scene.c
View File

@ -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;