Skip to content
Snippets Groups Projects
Commit c31c8fa1 authored by Joshua Leung's avatar Joshua Leung
Browse files

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

Fix for regression accidentally introduced in 5f18d863 (affecting current 2.70 rc-1)
which means that this setting wasn't working anymore at all.
parent 6ddd54f5
No related branches found
Tags
No related merge requests found
...@@ -236,8 +236,8 @@ static void rna_NlaStrip_use_auto_blend_set(PointerRNA *ptr, int value) ...@@ -236,8 +236,8 @@ static void rna_NlaStrip_use_auto_blend_set(PointerRNA *ptr, int value)
NlaStrip *data = (NlaStrip *)ptr->data; NlaStrip *data = (NlaStrip *)ptr->data;
if (value) { if (value) {
/* set the flag, then make sure a curve for this exists */ /* set the flag */
data->flag |= NLASTRIP_FLAG_USR_INFLUENCE; data->flag |= NLASTRIP_FLAG_AUTO_BLENDS;
/* validate state to ensure that auto-blend gets applied immediately */ /* validate state to ensure that auto-blend gets applied immediately */
if (ptr->id.data) { if (ptr->id.data) {
...@@ -249,7 +249,13 @@ static void rna_NlaStrip_use_auto_blend_set(PointerRNA *ptr, int value) ...@@ -249,7 +249,13 @@ static void rna_NlaStrip_use_auto_blend_set(PointerRNA *ptr, int value)
} }
} }
else { 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;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment