[Bf-blender-cvs] [7e3e28e] : Fix T39015: NLA Clip Auto Blend In/Out Check Box Not Working

[Joshua Leung]

Commit: 7e3e28ee50fdc669215ca4bcdf9a72cae8da0e23
Author: Joshua Leung
Date:   Fri Mar 7 19:11:53 2014 +1300
https://developer.blender.org/rB7e3e28ee50fdc669215ca4bcdf9a72cae8da0e23

Fix T39015: NLA Clip Auto Blend In/Out Check Box Not Working

Fix for regression accidentally introduced in 5f18d863a97 (affecting current 2.70 rc-1)
which means that this setting wasn't working anymore at all.

===================================================================

M	source/blender/makesrna/intern/rna_nla.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 07d221d..37de1d6 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -236,8 +236,8 @@ static void rna_NlaStrip_use_auto_blend_set(PointerRNA *ptr, int value)
 	NlaStrip *data = (NlaStrip *)ptr->data;
 	
 	if (value) {
-		/* set the flag, then make sure a curve for this exists */
-		data->flag |= NLASTRIP_FLAG_USR_INFLUENCE;
+		/* set the flag */
+		data->flag |= NLASTRIP_FLAG_AUTO_BLENDS;
 		
 		/* validate state to ensure that auto-blend gets applied immediately */
 		if (ptr->id.data) {
@@ -249,7 +249,13 @@ static void rna_NlaStrip_use_auto_blend_set(PointerRNA *ptr, int value)
 		}
 	}
 	else {
-		data->flag &= ~NLASTRIP_FLAG_USR_INFLUENCE;
+		/* clear the flag */
+		data->flag &= ~NLASTRIP_FLAG_AUTO_BLENDS;
+		
+		/* clear the values too, so that it's clear that there has been an effect */
+		/* TODO: it's somewhat debatable whether it's better to leave these in instead... */
+		data->blendin  = 0.0f;
+		data->blendout = 0.0f;
 	}
 }