[Bf-blender-cvs] [4ad31d5] master: NLA Drawing Tweaks

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


Commit: 4ad31d5bab704cd5a251c05bd5c0b3cfa787bc88
Author: Joshua Leung
Date:   Sun Mar 1 02:15:25 2015 +1300
Branches: master
https://developer.blender.org/rB4ad31d5bab704cd5a251c05bd5c0b3cfa787bc88

NLA Drawing Tweaks

* Strips in muted tracks are also drawn with dotted borders now to make it clearer
  that they are not contributing.

TODO:
* Perhaps dotted should be used for protected, and opacity for muted instead?

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

M	source/blender/editors/space_nla/nla_draw.c

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

diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index ef3c350..aae0e38 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -374,7 +374,7 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
 	}
 	
 	/* - line style: dotted for muted */
-	if (strip->flag & NLASTRIP_FLAG_MUTED)
+	if ((nlt->flag & NLATRACK_MUTED) || (strip->flag & NLASTRIP_FLAG_MUTED))
 		setlinestyle(4);
 		
 	/* draw outline */




More information about the Bf-blender-cvs mailing list