diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-03-07 10:11:53 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-03-07 10:11:53 +0400 |
| commit | c31c8fa14e0754a1d93d145ba5ce32866f24fb84 (patch) | |
| tree | 015a8e96fc4540cf5b2415dea6d1cbae551ded44 /source/blender/makesrna/intern/rna_nla.c | |
| parent | 6ddd54f5a5cad17d7d5e8b7b48a4616d71267aaa (diff) | |
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.
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 07d221dd80d..37de1d670f5 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; } } |