[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41765] trunk/blender/source/blender/ editors: Bugfix [#29212] Select before/ after current frame deselects all channels in

[Joshua Leung]

Revision: 41765
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41765
Author:   aligorith
Date:     2011-11-12 05:00:24 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Bugfix [#29212] Select before/after current frame deselects all channels in
graph editor

No need to deselect all channels when doing the select left/right operator,
since we don't replace the selection afterwards with anything useful. This would
be a problem when the "Only Show Selected" option is enabled (as it is by
default), as this results in the curves being worked on disappearing from view.

F-Curves though will still get deselected as a result of the code to deselect
keyframes. Will need to review whether this is still a good idea (original
intention was so that only curves with keyframes selected would remain
selected).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_action/action_select.c
    trunk/blender/source/blender/editors/space_graph/graph_select.c
    trunk/blender/source/blender/editors/space_nla/nla_select.c

Modified: trunk/blender/source/blender/editors/space_action/action_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_select.c	2011-11-12 04:40:53 UTC (rev 41764)
+++ trunk/blender/source/blender/editors/space_action/action_select.c	2011-11-12 05:00:24 UTC (rev 41765)
@@ -728,8 +728,9 @@
 	if (select_mode==SELECT_REPLACE) {
 		select_mode= SELECT_ADD;
 		
-		/* deselect all other channels and keyframes */
-		ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+		/* - deselect all other keyframes, so that just the newly selected remain
+		 * - channels aren't deselected, since we don't re-select any as a consequence
+		 */
 		deselect_action_keys(ac, 0, SELECT_SUBTRACT);
 	}
 	
@@ -918,8 +919,6 @@
 	KeyframeEditFunc select_cb, ok_cb;
 	KeyframeEditData ked= {{NULL}};
 	
-	/* initialise keyframe editing data */
-	
 	/* set up BezTriple edit callbacks */
 	select_cb= ANIM_editkeyframes_select(select_mode);
 	ok_cb= ANIM_editkeyframes_ok(BEZT_OK_FRAME);

Modified: trunk/blender/source/blender/editors/space_graph/graph_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_select.c	2011-11-12 04:40:53 UTC (rev 41764)
+++ trunk/blender/source/blender/editors/space_graph/graph_select.c	2011-11-12 05:00:24 UTC (rev 41765)
@@ -732,8 +732,9 @@
 	if (select_mode==SELECT_REPLACE) {
 		select_mode= SELECT_ADD;
 		
-		/* deselect all other channels and keyframes */
-		ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+		/* - deselect all other keyframes, so that just the newly selected remain
+		 * - channels aren't deselected, since we don't re-select any as a consequence
+		 */
 		deselect_graph_keys(ac, 0, SELECT_SUBTRACT);
 	}
 	

Modified: trunk/blender/source/blender/editors/space_nla/nla_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_select.c	2011-11-12 04:40:53 UTC (rev 41764)
+++ trunk/blender/source/blender/editors/space_nla/nla_select.c	2011-11-12 05:00:24 UTC (rev 41765)
@@ -376,8 +376,9 @@
 	if (select_mode==SELECT_REPLACE) {
 		select_mode= SELECT_ADD;
 		
-		/* deselect all other channels and keyframes */
-		ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+		/* - deselect all other keyframes, so that just the newly selected remain
+		 * - channels aren't deselected, since we don't re-select any as a consequence
+		 */
 		deselect_nla_strips(ac, 0, SELECT_SUBTRACT);
 	}