tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

image sequence - apply cyclic option AFTER the image offset, 

there was no way to properly loop on a sequence of images that didnt start frame 1.
This commit is contained in:
Campbell Barton 2012-07-03 14:25:06 +00:00
parent 42aaa47e9b
commit 2e3c474b2d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/image.c
View File

@ -2829,7 +2829,6 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, shor
/* transform to images space */
framenr = (cfra + iuser->fie_ima - 2) / iuser->fie_ima;
if (framenr > iuser->frames) framenr = iuser->frames;
framenr += iuser->offset;
if (iuser->cycl) {
framenr = ((framenr) % len);
@ -2837,6 +2836,9 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, shor
if (framenr == 0) framenr = len;
}
/* important to apply after else we cant loop on frames 100 - 110 for eg. */
framenr += iuser->offset;
return framenr;
}
}