* Fix for NLA with Map Old/Map New
authorMatt Ebb <matt@mke3.net>
Mon, 8 Oct 2007 09:24:29 +0000 (09:24 +0000)
committerMatt Ebb <matt@mke3.net>
Mon, 8 Oct 2007 09:24:29 +0000 (09:24 +0000)
NLA wasn't getting the correct strip start/end times when Map
Old/Map New was being used. This fixes it and makes the animation
get scaled properly.

source/blender/blenkernel/intern/action.c

index 8274e3253a9e9d5e8e2c2574a669dc7c75d32e0d..c43be2925bcaec580cb99398fbdb503f4c1a50db 100644 (file)
@@ -1068,7 +1068,7 @@ static void do_nla(Object *ob, int blocktype)
        bActionStrip *strip, *striplast=NULL, *stripfirst=NULL;
        float striptime, frametime, length, actlength;
        float blendfac, stripframe;
-       float scene_cfra= G.scene->r.cfra;
+       float scene_cfra= frame_to_float(G.scene->r.cfra); 
        int     doit, dostride;
        
        if(blocktype==ID_AR) {