2.5 - Various Cleanups/Fixes

* Animation channels - cleaned up the code for selecting channels (removed various TODO stuff that's going to be replaced by something better later). Also, added back the ctrl-shift select feature for groups, which should be extended for other channels too at some stage.
* Outliner - added missing flags to do-versions, and replaced the width calculations with the rna-width version for now, as that uses constant width of 100 with OL_X*indention

1 files changed, 3 insertions, 4 deletions

diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 039a5038027..832246897e0 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -856,13 +856,12 @@ static void mouse_action_keys (bAnimContext *ac, int mval[2], short selectmode)
 			/* Highlight either an Action-Channel or Action-Group */
 			if (achan) {
 				achan->flag |= ACHAN_SELECTED;
-				//hilight_channel(act, achan, 1);
-				//select_poseelement_by_name(achan->name, 2);	/* 2 is activate */
+				ANIM_action_set_active_channel(ac->data, ac->datatype, achan, ANIMTYPE_ACHAN);
 			}
 			else if (agrp) {
 				agrp->flag |= AGRP_SELECTED;
-				//set_active_actiongroup(act, agrp, 1);
-			}
+				ANIM_action_set_active_channel(ac->data, ac->datatype, agrp, ANIMTYPE_GROUP);
+			}	
 		}
 		else if (ac->datatype == ANIMCONT_GPENCIL) {
 			ANIM_deselect_anim_channels(ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);