diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
| commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
| tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/blenkernel/intern/tracking.c | |
| parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
| parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index d8ee5e5fc7d..f19f27c85a7 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1607,7 +1607,7 @@ MovieTrackingPlaneMarker *BKE_tracking_plane_marker_insert(MovieTrackingPlaneTra int a = plane_track->markersnr; /* Find position in array where to add new marker. */ - /* TODO(sergey): we coud use bisect to speed things up. */ + /* TODO(sergey): we could use bisect to speed things up. */ while (a--) { if (plane_track->markers[a].framenr < plane_marker->framenr) { break; @@ -1993,10 +1993,10 @@ void BKE_tracking_camera_to_blender(MovieTracking *tracking, Scene *scene, Camer camera->sensor_fit = CAMERA_SENSOR_FIT_AUTO; camera->lens = focal * camera->sensor_x / width; - scene->r.xsch = width * tracking->camera.pixel_aspect; + scene->r.xsch = width; scene->r.ysch = height; - scene->r.xasp = 1.0f; + scene->r.xasp = tracking->camera.pixel_aspect; scene->r.yasp = 1.0f; BKE_tracking_camera_shift_get(tracking, width, height, &camera->shiftx, &camera->shifty); |