[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48539] trunk/blender/source/blender/ blenkernel/intern/image.c: image sequence - apply cyclic option AFTER the image offset,

[Campbell Barton]

Revision: 48539
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48539
Author:   campbellbarton
Date:     2012-07-03 14:25:06 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2012-07-03 14:05:18 UTC (rev 48538)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2012-07-03 14:25:06 UTC (rev 48539)
@@ -2829,7 +2829,6 @@
 		/* 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 @@
 			if (framenr == 0) framenr = len;
 		}
 
+		/* important to apply after else we cant loop on frames 100 - 110 for eg. */
+		framenr += iuser->offset;
+
 		return framenr;
 	}
 }