[Bf-blender-cvs] [dbb2b29] master: Action Stashing: Newly stashed strips now get "sync length" option enabled by default

Joshua Leung noreply at git.blender.org
Mon Apr 20 07:29:34 CEST 2015


Commit: dbb2b29beab46a81c1ea95521a2afe39145717c5
Author: Joshua Leung
Date:   Mon Apr 20 17:25:00 2015 +1200
Branches: master
https://developer.blender.org/rBdbb2b29beab46a81c1ea95521a2afe39145717c5

Action Stashing: Newly stashed strips now get "sync length" option enabled by default

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

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

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

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 650efea..1ad6446 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -1649,6 +1649,12 @@ bool BKE_nla_action_stash(AnimData *adt)
 	nlt->flag = (NLATRACK_MUTED | NLATRACK_PROTECTED);
 	strip->flag &= ~(NLASTRIP_FLAG_SELECT | NLASTRIP_FLAG_ACTIVE);
 	
+	/* also mark the strip for auto syncing the length, so that the strips accurately
+	 * reflect the length of the action
+	 * XXX: we could do with some extra flags here to prevent repeats/scaling options from working!
+	 */
+	strip->flag |= NLASTRIP_FLAG_SYNC_LENGTH;
+	
 	/* succeeded */
 	return true;
 }




More information about the Bf-blender-cvs mailing list