diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 17:22:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 17:22:06 +0300 |
| commit | 36a9436d808837110a9c1bb2ec897a358ea62d56 (patch) | |
| tree | 9cea3795c43b6ddca4706f883ebef3e5235669f9 /source/blender/makesrna/intern/rna_tracking.c | |
| parent | bc95c7a3ea6fbcfbee43bd61c0a709de0d0daf26 (diff) | |
| parent | ddee0931b8687d01186f1941d483c6b3622d1833 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_tracking.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index ccc118edfb6..4831f36d20a 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -665,7 +665,7 @@ static void rna_trackingObject_remove(MovieTracking *tracking, ReportList *repor WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL); } -static MovieTrackingMarker *rna_trackingMarkers_find_frame(MovieTrackingTrack *track, int framenr, int exact) +static MovieTrackingMarker *rna_trackingMarkers_find_frame(MovieTrackingTrack *track, int framenr, bool exact) { if (exact) return BKE_tracking_marker_get_exact(track, framenr); @@ -707,7 +707,7 @@ static void rna_trackingMarkers_delete_frame(MovieTrackingTrack *track, int fram } static MovieTrackingPlaneMarker *rna_trackingPlaneMarkers_find_frame(MovieTrackingPlaneTrack *plane_track, - int framenr, int exact) + int framenr, bool exact) { if (exact) return BKE_tracking_plane_marker_get_exact(plane_track, framenr); |