Browse Source

Merge pull request #1065 from stratboy61/master

Simply reverted part of sgrenier fix regarding loopBlendTime
Sean Paul Taylor 12 years ago
parent
commit
7e71594766
1 changed files with 1 additions and 1 deletions
  1. 1 1
      gameplay/src/Animation.cpp

+ 1 - 1
gameplay/src/Animation.cpp

@@ -254,7 +254,7 @@ void Animation::createClips(Properties* animationProperties, unsigned int frameC
         int begin = pClip->getInt("begin");
         int begin = pClip->getInt("begin");
         int end = pClip->getInt("end");
         int end = pClip->getInt("end");
 
 
-        AnimationClip* clip = createClip(pClip->getId(), ((float)begin / (frameCount-1)) * _duration, ((float)end / (frameCount-1)) * _duration);
+        AnimationClip* clip = createClip(pClip->getId(), ((float)begin / frameCount) * _duration, ((float)end / frameCount) * _duration);
 
 
         const char* repeat = pClip->getString("repeatCount");
         const char* repeat = pClip->getString("repeatCount");
         if (repeat)
         if (repeat)