[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61077] trunk/blender/source/blender/ blenkernel/intern/fcurve.c: Bugfix [#36950] Restrict Frame Range not being obeyed on Driver F-Curves

[Joshua Leung]

Revision: 61077
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61077
Author:   aligorith
Date:     2013-11-04 04:18:28 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
Bugfix [#36950] Restrict Frame Range not being obeyed on Driver F-Curves

By default, drivers (used to) automatically map the driver result (i.e.
"evaltime" or the x-coordinates in the driver graphs) to results. This evaltime
=> cvalue mapping is necessary when there are absolutely no keyframes or
modifiers on a driver F-Curve, or else nothing would happen.

However, when there are modifiers on these driver F-Curves, and these modifiers
only work within certain ranges, there would be confusing and unwanted
situations where even if you clamped the modifiers to only generating a curve
within certain frame ranges, the final driver output would still ignore the
results of the curve due to the underlying 1-1 mapping.

This commit introduces a check to ensure that this automatic mapping won't
happen during such invalid ranges.

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

Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c	2013-11-04 01:18:33 UTC (rev 61076)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c	2013-11-04 04:18:28 UTC (rev 61077)
@@ -2139,11 +2139,39 @@
 	
 	/* if there is a driver (only if this F-Curve is acting as 'driver'), evaluate it to find value to use as "evaltime" 
 	 * since drivers essentially act as alternative input (i.e. in place of 'time') for F-Curves
-	 *	- this value will also be returned as the value of the 'curve', if there are no keyframes
 	 */
 	if (fcu->driver) {
 		/* evaltime now serves as input for the curve */
-		evaltime = cvalue = evaluate_driver(fcu->driver, evaltime);
+		evaltime = evaluate_driver(fcu->driver, evaltime);
+		
+		/* only do a default 1-1 mapping if it's unlikely that anything else will set a value... */
+		if (fcu->totvert == 0) {
+			FModifier *fcm;
+			bool do_linear = true;
+			
+			/* out-of-range F-Modifiers will block, as will those which just plain overwrite the values 
+			 * XXX: additive is a bit more dicey; it really depends then if things are in range or not...
+			 */
+			for (fcm = fcu->modifiers.first; fcm; fcm = fcm->next) {
+				/* if there are range-restrictions, we must definitely block [#36950] */
+				if ((fcm->flag & FMODIFIER_FLAG_RANGERESTRICT) == 0 ||
+		    		((fcm->sfra <= evaltime) && (fcm->efra >= evaltime)) )
+		    	{
+		    		/* within range: here it probably doesn't matter, though we'd want to check on additive... */	
+		    	}
+		    	else {
+		    		/* outside range: modifier shouldn't contribute to the curve here, though it does in other areas,
+					 * so neither should the driver!
+					 */
+					do_linear = false;
+		    	}
+			}
+			
+			/* only copy over results if none of the modifiers disagreed with this */
+			if (do_linear) {
+				cvalue = evaltime;	
+			}
+		}
 	}
 	
 	/* evaluate modifiers which modify time to evaluate the base curve at */