[Bf-blender-cvs] [0d64e26] master: Clip editor: Deselecting with shift-LMB does not work in graph view

[Sergey Sharybin]

Commit: 0d64e26740a7f0b6052e386e9a9ad2e88d4a4058
Author: Sergey Sharybin
Date:   Wed May 13 15:55:32 2015 +0500
Branches: master
https://developer.blender.org/rB0d64e26740a7f0b6052e386e9a9ad2e88d4a4058

Clip editor: Deselecting with shift-LMB does not work in graph view

===================================================================

M	source/blender/editors/space_clip/clip_graph_ops.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c
index 2a2f15c..9011f08 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.c
+++ b/source/blender/editors/space_clip/clip_graph_ops.c
@@ -200,10 +200,18 @@ static bool mouse_select_knot(bContext *C, float co[2], bool extend)
 					                            toggle_selection_cb);
 				}
 
-				if (userdata.coord == 0)
-					userdata.marker->flag |= MARKER_GRAPH_SEL_X;
-				else
-					userdata.marker->flag |= MARKER_GRAPH_SEL_Y;
+				if (userdata.coord == 0) {
+					if (extend && (userdata.marker->flag & MARKER_GRAPH_SEL_X) != 0)
+						userdata.marker->flag &= ~MARKER_GRAPH_SEL_X;
+					else
+						userdata.marker->flag |= MARKER_GRAPH_SEL_X;
+				}
+				else {
+					if (extend && (userdata.marker->flag & MARKER_GRAPH_SEL_Y) != 0)
+						userdata.marker->flag &= ~MARKER_GRAPH_SEL_Y;
+					else
+						userdata.marker->flag |= MARKER_GRAPH_SEL_Y;
+				}
 
 				return true;
 			}