[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32852] trunk/blender/source/blender/ blenkernel/intern/nla.c: bugfix [#24445] NLA reverse option flickers

Campbell Barton ideasman42 at gmail.com
Wed Nov 3 09:46:15 CET 2010


Revision: 32852
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32852
Author:   campbellbarton
Date:     2010-11-03 09:46:14 +0100 (Wed, 03 Nov 2010)

Log Message:
-----------
bugfix [#24445] NLA reverse option flickers
UnMapping the reversed NLA strips timing was incorrect.

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

Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c	2010-11-03 06:31:53 UTC (rev 32851)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c	2010-11-03 08:46:14 UTC (rev 32852)
@@ -362,7 +362,7 @@
 			return strip->end - scale*(cframe - strip->actstart);
 		}
 		else if (mode == NLATIME_CONVERT_UNMAP) {
-			return strip->actend - (strip->end - cframe) / scale;	
+			return (strip->end + (strip->actstart * scale - cframe)) / scale;
 		}
 		else /* if (mode == NLATIME_CONVERT_EVAL) */{
 			if (IS_EQ(cframe, strip->end) && IS_EQ(strip->repeat, ((int)strip->repeat))) {





More information about the Bf-blender-cvs mailing list