[Bf-blender-cvs] [2b1e0c038cb] master: Tracking: Restore check for marker being disabled

[Sergey Sharybin]

Commit: 2b1e0c038cb083a547969ccca5d4c0e96878d21a
Author: Sergey Sharybin
Date:   Tue Sep 17 09:29:13 2019 +0200
Branches: master
https://developer.blender.org/rB2b1e0c038cb083a547969ccca5d4c0e96878d21a

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.

===================================================================

M	source/blender/editors/space_clip/clip_draw.c

===================================================================

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;
     }