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-11-10 16:15:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-10 16:15:09 +0400
commitba9794af021696eae92813546a069d902f7988c0 (patch)
tree0d800bdc8a74bbc585a3e516a161d00cf655a460 /source/blender/editors/space_clip/clip_draw.c
parent662549b4ec29ae285af0a8c98450fb85e2636d30 (diff)
Fixed possible issue drawing undistorted clip in clip editor.
Check for marker's visibility was a bit odd.
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 9eb96a9a4c5..630038d4c6b 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -936,7 +936,8 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
draw_marker_slide_zones(sc, track, marker, cur_pos, 1, 0, 0, width, height);
draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 0, 0, width, height);
- if(fp) fp+= 2;
+ if(fp)
+ fp+= 2;
}
}
@@ -950,20 +951,19 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
while(track) {
if((track->flag&TRACK_HIDDEN)==0) {
int act= track==act_track;
+ marker= BKE_tracking_get_marker(track, framenr);
- if(!act) {
- marker= BKE_tracking_get_marker(track, framenr);
-
- if(MARKER_VISIBLE(sc, marker)) {
+ if(MARKER_VISIBLE(sc, marker)) {
+ if(!act) {
copy_v2_v2(cur_pos, fp ? fp : marker->pos);
draw_marker_areas(sc, track, marker, cur_pos, width, height, 0, 1);
draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 1, 0, width, height);
}
- }
- if(MARKER_VISIBLE(sc, marker) && fp)
- fp+= 2;
+ if(fp)
+ fp+= 2;
+ }
}
track= track->next;