Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-07-20 14:51:47 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-07-20 14:51:47 +0400
commit0fec30a35f4eff2b56747e47dc3f8cb3e8c79320 (patch)
tree44e33402b9e35cb8f9d6b0ebd99519983d977aa2 /source/blender/blenkernel/BKE_tracking.h
parent5d978f1e87dba1192f10db33482a2f99496bdd39 (diff)
Camera tracking integration
=========================== - Internal change: do not use maroses for checking the only one bit of track/marker flags. - Do not display track name for disabled markers when "Show Disabled" is turned off. - Option to lock tracks. Locked tracks can't be be moved, scaled, re-tracked and so.
Diffstat (limited to 'source/blender/blenkernel/BKE_tracking.h')
-rw-r--r--source/blender/blenkernel/BKE_tracking.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index 67aabfbae07..79c0e6c62a5 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -84,10 +84,9 @@ void BKE_tracking_detect(struct MovieTracking *tracking, struct ImBuf *imbuf, in
struct MovieTrackingTrack *BKE_tracking_indexed_bundle(struct MovieTracking *tracking, int bundlenr);
-#define TRACK_SELECTED(track) ((track)->flag&SELECT || (track)->pat_flag&SELECT || (track)->search_flag&SELECT)
-#define TRACK_AREA_SELECTED(track, area) ((area)==TRACK_AREA_POINT?(track)->flag&SELECT : ((area)==TRACK_AREA_PAT?(track)->pat_flag&SELECT:(track)->search_flag&SELECT))
-#define TRACK_VIEW_SELECTED(track) ((track->flag&TRACK_HIDDEN)==0 && TRACK_SELECTED(track))
-#define TRACK_VISIBLE(track) (((track)->flag&TRACK_HIDDEN)==0)
+#define TRACK_SELECTED(track) (((track->flag&TRACK_HIDDEN)==0) && ((track)->flag&SELECT || (track)->pat_flag&SELECT || (track)->search_flag&SELECT))
+#define TRACK_AREA_SELECTED(track, area) (((track->flag&TRACK_HIDDEN)==0) && ((area)==TRACK_AREA_POINT?(track)->flag&SELECT : ((area)==TRACK_AREA_PAT?(track)->pat_flag&SELECT:(track)->search_flag&SELECT)))
+
#define MARKER_VISIBLE(sc, marker) (((marker)->flag&MARKER_DISABLED)==0 || ((sc)->flag&SC_HIDE_DISABLED)==0)
#define CLAMP_PAT_DIM 1