[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14591] trunk/blender/source/blender: == Action Editor - Group Colors ==

[Joshua Leung]

Revision: 14591
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14591
Author:   aligorith
Date:     2008-04-28 13:40:38 +0200 (Mon, 28 Apr 2008)

Log Message:
-----------
== Action Editor - Group Colors ==

Made option to show group colors the default. If this is too colourful for you, disable it in the View menu. 

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_action_types.h
    trunk/blender/source/blender/src/drawaction.c
    trunk/blender/source/blender/src/header_action.c

Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h	2008-04-28 11:05:01 UTC (rev 14590)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h	2008-04-28 11:40:38 UTC (rev 14591)
@@ -234,8 +234,8 @@
 	SACTION_HORIZOPTIMISEON = (1<<5),
 		/* hack for moving pose-markers (temp flag)  */
 	SACTION_POSEMARKERS_MOVE = (1<<6),
-		/* draw action channels using group colours (where applicable) */
-	SACTION_DRAWGCOLORS = (1<<7)
+		/* don't draw action channels using group colours (where applicable) */
+	SACTION_NODRAWGCOLORS = (1<<7)
 } SACTION_FLAG;	
 
 /* SpaceAction AutoSnap Settings (also used by SpaceNLA) */

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2008-04-28 11:05:01 UTC (rev 14590)
+++ trunk/blender/source/blender/src/drawaction.c	2008-04-28 11:40:38 UTC (rev 14591)
@@ -637,7 +637,7 @@
 				 *	- use 3 shades of color group/standard colour for 3 indention level
 				 *	- only use group colors if allowed to, and if actually feasible
 				 */
-				if ( (G.saction->flag & SACTION_DRAWGCOLORS) && 
+				if ( !(G.saction->flag & SACTION_NODRAWGCOLORS) && 
 					 (grp) && (grp->customCol) ) 
 				{
 					char cp[3];

Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c	2008-04-28 11:05:01 UTC (rev 14590)
+++ trunk/blender/source/blender/src/header_action.c	2008-04-28 11:40:38 UTC (rev 14591)
@@ -347,7 +347,7 @@
 			G.saction->flag ^= SACTION_HORIZOPTIMISEON;
 			break;
 		case ACTMENU_VIEW_GCOLORS: /* Draw grouped-action channels using its group's color */
-			G.saction->flag ^= SACTION_DRAWGCOLORS;
+			G.saction->flag ^= SACTION_NODRAWGCOLORS;
 			break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
@@ -395,7 +395,7 @@
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
 					 ACTMENU_VIEW_NOHIDE, "");
 					 
-	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_DRAWGCOLORS)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NODRAWGCOLORS)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
 					 "Use Group Colors|", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
 					 ACTMENU_VIEW_GCOLORS, "");