[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55261] trunk/blender/source/blender/ editors: Bugfix: Selecting AnimData "expanders" in AnimEditors works again

[Joshua Leung]

Revision: 55261
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55261
Author:   aligorith
Date:     2013-03-14 05:01:51 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Bugfix: Selecting AnimData "expanders" in AnimEditors works again

Somewhere along the line, this functionality broke, even though the code to
handle these settings was still in place for many of these. The main implication
of this fix is that it should now be possible to select a particular AnimData
block, which makes it possible to do things such as changing the action
associated with that AnimData block (i.e. via the "Animation Data" panel in the
NLA Editor), as well as other operations which I've had on the todolist for a
while. Stay tuned!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/space_nla/nla_channels.c
    trunk/blender/source/blender/editors/space_nla/nla_draw.c

Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2013-03-14 03:48:46 UTC (rev 55260)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2013-03-14 05:01:51 UTC (rev 55261)
@@ -381,6 +381,10 @@
 		case ACHANNEL_SETTING_MUTE:
 			return ((ac) && (ac->spacetype == SPACE_NLA));
 			
+		/* select is ok for most "ds*" channels (e.g. dsmat) */
+		case ACHANNEL_SETTING_SELECT:
+			return 1;
+			
 		/* other flags are never supported */
 		default:
 			return 0;

Modified: trunk/blender/source/blender/editors/space_nla/nla_channels.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_channels.c	2013-03-14 03:48:46 UTC (rev 55260)
+++ trunk/blender/source/blender/editors/space_nla/nla_channels.c	2013-03-14 05:01:51 UTC (rev 55261)
@@ -140,7 +140,7 @@
 				}
 				else {
 					Base *b;
-
+					
 					/* deselect all */
 					/* TODO: should this deselect all other types of channels too? */
 					for (b = sce->base.first; b; b = b->next) {

Modified: trunk/blender/source/blender/editors/space_nla/nla_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_draw.c	2013-03-14 03:48:46 UTC (rev 55260)
+++ trunk/blender/source/blender/editors/space_nla/nla_draw.c	2013-03-14 05:01:51 UTC (rev 55261)
@@ -759,7 +759,6 @@
 				glEnable(GL_BLEND);
 				
 				/* draw backing strip behind channel name */
-				// FIXME: hardcoded colors!!!
 				if (group == 5) {
 					float color[4];