[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38566] branches/soc-2011-salad: Merging r38564 through r38565 soc-2011-tomato into soc-2011-salad

[Sergey Sharybin]

Revision: 38566
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38566
Author:   nazgul
Date:     2011-07-21 16:05:21 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Merging r38564 through r38565 soc-2011-tomato into soc-2011-salad

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38564
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38565

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38563
/trunk/blender:36834-38562
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38565
/trunk/blender:36834-38562

Modified: branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c	2011-07-21 16:04:01 UTC (rev 38565)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c	2011-07-21 16:05:21 UTC (rev 38566)
@@ -668,7 +668,13 @@
 		action= SEL_SELECT;
 		track= clip->tracking.tracks.first;
 		while(track) {
-			if(TRACK_SELECTED(track)) {
+			int selected= 0;
+
+			selected|= track->flag&SELECT;
+			if(sc->flag&SC_SHOW_MARKER_PATTERN) selected|= track->pat_flag&SELECT;
+			if(sc->flag&SC_SHOW_MARKER_SEARCH) selected|= track->search_flag&SELECT;
+
+			if(selected) {
 				action= SEL_DESELECT;
 				break;
 			}
@@ -691,13 +697,15 @@
 						break;
 					case SEL_DESELECT:
 						track->flag&= ~SELECT;
-						if(sc->flag&SC_SHOW_MARKER_PATTERN) track->pat_flag&= ~SELECT;
-						if(sc->flag&SC_SHOW_MARKER_SEARCH) track->search_flag&= ~SELECT;
+						track->pat_flag&= ~SELECT;
+						track->search_flag&= ~SELECT;
 						break;
 					case SEL_INVERT:
 						track->flag^= SELECT;
-						if(sc->flag&SC_SHOW_MARKER_PATTERN) track->pat_flag^= SELECT;
-						if(sc->flag&SC_SHOW_MARKER_SEARCH) track->search_flag^= SELECT;
+						if(sc->flag&SC_SHOW_MARKER_PATTERN && (track->pat_flag&SELECT))
+							track->pat_flag^= SELECT;
+						if(sc->flag&SC_SHOW_MARKER_SEARCH && (track->search_flag&SELECT))
+							track->search_flag^= SELECT;
 						break;
 				}
 			}