[Bf-blender-cvs] [5efad6f] master: Ported code for setting colour of NLA Track anim channel

Joshua Leung noreply at git.blender.org
Wed Nov 20 13:33:36 CET 2013


Commit: 5efad6f6c616124b4db6210cb3bf527bb7c2a696
Author: Joshua Leung
Date:   Wed Nov 20 19:24:17 2013 +1300
http://developer.blender.org/rB5efad6f6c616124b4db6210cb3bf527bb7c2a696

Ported code for setting colour of NLA Track anim channel

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

M	source/blender/editors/animation/anim_channels_defines.c

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

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 02e3c6a..3848eb3 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2766,6 +2766,25 @@ static bAnimChannelType ACF_MASKLAYER =
 
 /* NLA Track ----------------------------------------------- */
 
+/* get backdrop color for nla track channels */
+static void acf_nlatrack_color(bAnimContext *UNUSED(ac), bAnimListElem *ale, float r_color[3])
+{
+	NlaTrack *nlt = (NlaTrack *)ale->data;
+	AnimData *adt = ale->adt;
+	bool nonSolo = false;
+	
+	/* is track enabled for solo drawing? */
+	if ((adt) && (adt->flag & ADT_NLA_SOLO_TRACK)) {
+		if ((nlt->flag & NLATRACK_SOLO) == 0) {
+			/* tag for special non-solo handling */
+			nonSolo = true;
+		}
+	}
+	
+	/* set color for nla track */
+	UI_GetThemeColorShade3fv(TH_HEADER, ((nonSolo == false) ? 20 : -20), r_color);
+}
+
 /* name for nla track entries */
 static void acf_nlatrack_name(bAnimListElem *ale, char *name)
 {
@@ -2869,7 +2888,7 @@ static bAnimChannelType ACF_NLATRACK =
 {
 	"NLA Track",                    /* type name */
 	
-	acf_generic_channel_color,      /* backdrop color */   // XXX: color depends on whether track is solo or not!
+	acf_nlatrack_color,             /* backdrop color */
 	acf_generic_channel_backdrop,   /* backdrop */
 	acf_generic_indention_flexible, /* indent level */
 	acf_generic_group_offset,       /* offset */           // XXX?




More information about the Bf-blender-cvs mailing list