Merge remote-tracking branch 'origin/release/1.9.x'

This commit is contained in:
rdb 2015-07-27 12:49:54 +02:00
commit d7b5fe37da
1 changed files with 3 additions and 3 deletions

View File

@ -153,7 +153,7 @@ class AnimControlInterval(Interval.Interval):
else:
frame = max(min(absFrame, numFrames - 1), 0)
self.controls.poseAll(frame)
self.controls.poseAll(int(frame))
self.state = CInterval.SStarted
self.currT = t
@ -169,9 +169,9 @@ class AnimControlInterval(Interval.Interval):
# a hitch in the animation when it plays back-to-back with
# the next cycle.
if self.reverse:
self.controls.poseAll(self.startFrame)
self.controls.poseAll(int(self.startFrame))
else:
self.controls.poseAll(self.endFrame)
self.controls.poseAll(int(self.endFrame))
else:
# Otherwise, the user-specified duration determines which