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>2019-09-17 10:29:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-09-17 10:29:13 +0300
commit2b1e0c038cb083a547969ccca5d4c0e96878d21a (patch)
treef4f9c28bf7da9c9484a908cfb52966c06cd5cac9 /source/blender/editors/space_clip
parentbac31845408074cf68ce9fb08b0212a778712225 (diff)
Tracking: Restore check for marker being disabled
A regression since refactor from yesterday which made it so path is displayed at a frame where marker is disabled.
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 5ce4b26b91b..9476a9eeadd 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -436,7 +436,7 @@ static int track_to_path_segment(SpaceClip *sc,
const MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, current_frame);
/* Check whether there is marker at exact current frame.
* If not, we don't have anything to be put to path. */
- if (marker == NULL) {
+ if (marker == NULL || (marker->flag & MARKER_DISABLED)) {
return 0;
}
/* Index inside of path array where we write data to. */
@@ -449,7 +449,7 @@ static int track_to_path_segment(SpaceClip *sc,
point_index += direction;
current_frame += direction;
marker = BKE_tracking_marker_get_exact(track, current_frame);
- if (marker == NULL) {
+ if (marker == NULL || (marker->flag & MARKER_DISABLED)) {
/* Reached end of tracked segment. */
break;
}