[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18917] branches/blender2.5/blender/source /blender/editors: DopeSheet/Action Editor: Fixed display and expand-widget of 'Group' channels

[Joshua Leung]

Revision: 18917
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18917
Author:   aligorith
Date:     2009-02-11 00:08:53 +0100 (Wed, 11 Feb 2009)

Log Message:
-----------
DopeSheet/Action Editor: Fixed display and expand-widget of 'Group' channels

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
    branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c

Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c	2009-02-10 22:45:20 UTC (rev 18916)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c	2009-02-10 23:08:53 UTC (rev 18917)
@@ -1136,7 +1136,7 @@
 		case ANIMTYPE_GROUP: 
 		{
 			bActionGroup *agrp= (bActionGroup *)ale->data;
-			short offset= (ac->datatype == ANIMCONT_DOPESHEET)? 18 : 0;
+			short offset= (ELEM3(ac->datatype, ANIMCONT_DOPESHEET, ANIMCONT_FCURVES, ANIMCONT_DRIVERS))? 18 : 0;
 			
 			if ((x < (offset+17)) && (agrp->channels.first)) {
 				/* toggle expand */

Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c	2009-02-10 22:45:20 UTC (rev 18916)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c	2009-02-10 23:08:53 UTC (rev 18917)
@@ -594,7 +594,7 @@
 					indent= 0;
 					special= -1;
 					
-					offset= (ale->id) ? 16 : 0;
+					offset= (ac->datatype == ANIMCONT_DOPESHEET) ? 16 : 0;
 					
 					/* only show expand if there are any channels */
 					if (agrp->channels.first) {