diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-12-07 13:50:02 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-12-07 13:50:02 +0300 |
| commit | be7192c0bd161a3b4a3ef28eca60fcc12730d986 (patch) | |
| tree | e3653785205be9e124e527c56e4e32d22915ab27 /source/blender/blenloader/intern | |
| parent | 9723e3ef39d0a0c8b7a47f145c52982481109f2f (diff) | |
== NLA - Scale Related Fixes ==
* Old files now get initialised with the correct scale. The wrong calculation was being used
* Added a new tool to Alt-S menu: "Apply Scale"
This tool causes all the keyframes in the active strip to be moved to their NLA-scaled times, the scale to be set to 1.0, and the frame ranges recalculated accordingly (to remove any nasty weird errors)
* Scale field now draws red when the action-range is < 1, and the tooltip in this case instructs the user how to fix this (by using "Apply Scale").
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f6b0c4cb4dc..68bf1d1815c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7211,8 +7211,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (length == 0.0f) length= 1.0f; actlength = strip->actend-strip->actstart; - // right calculation? - strip->scale = actlength / (length * repeat); + strip->scale = length / (repeat * actlength); if (strip->scale == 0.0f) strip->scale= 1.0f; } } |