[Bf-blender-cvs] [afeca63] master: Fix: "Tweak user" red-alert flag was not getting set on strips on active track

Joshua Leung noreply at git.blender.org
Thu Oct 8 13:09:20 CEST 2015


Commit: afeca633c283f85ac0fd2f7c5cc725763265fa5a
Author: Joshua Leung
Date:   Thu Oct 8 23:55:24 2015 +1300
Branches: master
https://developer.blender.org/rBafeca633c283f85ac0fd2f7c5cc725763265fa5a

Fix: "Tweak user" red-alert flag was not getting set on strips on active track

The "tweak user" flag used to flag strips using the same action as the active strip
was not getting set on other strips that live on the same track as the active one.
Strips with this flag set are shown with a red colour to indicate that editing the
action may have the unintended consequence of modifying another strip.

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

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

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

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index a04eb9b..378bb82 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -1791,6 +1791,13 @@ bool BKE_nla_tweakmode_enter(AnimData *adt)
 		}
 	}
 	
+	/* tag all other strips in active track that uses the same action as the active strip */
+	for (strip = activeTrack->strips.first; strip; strip = strip->next) {
+		if ((strip->act == activeStrip->act) && (strip != activeStrip))
+			strip->flag |= NLASTRIP_FLAG_TWEAKUSER;
+		else
+			strip->flag &= ~NLASTRIP_FLAG_TWEAKUSER;
+	}
 	
 	/* go over all the tracks after AND INCLUDING the active one, tagging them as being disabled 
 	 *	- the active track needs to also be tagged, otherwise, it'll overlap with the tweaks going on




More information about the Bf-blender-cvs mailing list