[Bf-blender-cvs] [7af4690] master: NLA: Auto-Blends option is no longer enabled on all newly added strips

Joshua Leung noreply at git.blender.org
Sat Feb 28 14:37:12 CET 2015


Commit: 7af469029510aa1eac5f6afaa381329f6093d73a
Author: Joshua Leung
Date:   Sat Feb 28 02:43:44 2015 +1300
Branches: master
https://developer.blender.org/rB7af469029510aa1eac5f6afaa381329f6093d73a

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.

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

M	source/blender/blenkernel/intern/nla.c

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

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 8e9f86d..f117dcf 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;




More information about the Bf-blender-cvs mailing list