[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38565] branches/soc-2011-tomato/source/ blender/editors/space_clip/tracking_ops.c: Camera tracking integration

[Sergey Sharybin]

Revision: 38565
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38565
Author:   nazgul
Date:     2011-07-21 16:04:01 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fixed own mistake in changed Select All operator.

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

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-07-21 15:11:29 UTC (rev 38564)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-07-21 16:04:01 UTC (rev 38565)
@@ -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;
 				}
 			}