[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12230] trunk/blender/source/blender/ blenkernel/intern/action.c: * Fix for NLA with Map Old/Map New

[Matt Ebb]

Revision: 12230
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12230
Author:   broken
Date:     2007-10-08 11:24:29 +0200 (Mon, 08 Oct 2007)

Log Message:
-----------
* Fix for NLA with Map Old/Map New

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.

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

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2007-10-08 04:40:31 UTC (rev 12229)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2007-10-08 09:24:29 UTC (rev 12230)
@@ -1068,7 +1068,7 @@
 	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) {