diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-02-27 16:43:44 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-02-28 16:34:43 +0300 |
commit | 7af469029510aa1eac5f6afaa381329f6093d73a (patch) | |
tree | 34a338b8d2c26de37d70d84e22ab784c3efcb552 /source/blender/blenkernel/intern | |
parent | b44201d8b91011434b6edbbabd7784160cb94cc6 (diff) |
NLA: Auto-Blends option is no longer enabled on all newly added strips
This may be put back again later, but currently, this is a bit too trigger-happy
to have it on. It tends to mess up results more than it helps.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 8e9f86d7c19..f117dcfe0ff 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -299,13 +299,12 @@ NlaStrip *add_nlastrip(bAction *act) /* generic settings * - selected flag to highlight this to the user - * - auto-blends to ensure that blend in/out values are automatically - * determined by overlaps of strips + * - (XXX) disabled Auto-Blends, as this was often causing some unwanted effects * - (XXX) synchronization of strip-length in accordance with changes to action-length * is not done though, since this should only really happens in editmode for strips now * though this decision is still subject to further review... */ - strip->flag = NLASTRIP_FLAG_SELECT | NLASTRIP_FLAG_AUTO_BLENDS; + strip->flag = NLASTRIP_FLAG_SELECT; /* assign the action reference */ strip->act = act; |