[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13779] trunk/blender/source/blender/src/ header_action.c: Tweak to last commit:

[Joshua Leung]

Revision: 13779
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13779
Author:   aligorith
Date:     2008-02-20 12:07:14 +0100 (Wed, 20 Feb 2008)

Log Message:
-----------
Tweak to last commit:

"Channels" menu now only draws when there is an active action. No space is reserved for it, so the items do shift around a little bit, which may not be so great for muscle memory...

Modified Paths:
--------------
    trunk/blender/source/blender/src/header_action.c

Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c	2008-02-20 11:02:32 UTC (rev 13778)
+++ trunk/blender/source/blender/src/header_action.c	2008-02-20 11:07:14 UTC (rev 13779)
@@ -1473,11 +1473,12 @@
 					  "Select", xco, -2, xmax-3, 24, "");
 		xco+= xmax;
 		
-		// TODO: options in channel menu only work for actions... disable this in other cases...
-		xmax= GetButStringLength("Channel");
-		uiDefPulldownBut(block, action_channelmenu, NULL, 
-					  "Channel", xco, -2, xmax-3, 24, "");
-		xco+= xmax;
+		if (G.saction->action) {
+			xmax= GetButStringLength("Channel");
+			uiDefPulldownBut(block, action_channelmenu, NULL, 
+						  "Channel", xco, -2, xmax-3, 24, "");
+			xco+= xmax;
+		}
 		
 		xmax= GetButStringLength("Marker");
 		uiDefPulldownBut(block, action_markermenu, NULL,