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:
authorCampbell Barton <ideasman42@gmail.com>2012-08-01 02:01:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-01 02:01:44 +0400
commit872ebc731038c0465a21de92bedad33b771c9b4b (patch)
tree6ed40889f482891494c01f35f5dfe678a197227c /source/blender/blenkernel/intern/tracking.c
parent33a9cafc3b635c05ca40fef853d5b5282d56ec13 (diff)
fill in dummy values when using movie clip distort node but compiled without libmv.
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
-rw-r--r--source/blender/blenkernel/intern/tracking.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 5d50e8c491e..693f6fc1057 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -1535,7 +1535,7 @@ void BKE_tracking_distortion_free(MovieDistortion *distortion)
MEM_freeN(distortion);
}
-void BKE_tracking_distort_v2(MovieTracking *tracking, float co[2], float nco[2])
+void BKE_tracking_distort_v2(MovieTracking *tracking, const float co[2], float r_co[2])
{
MovieTrackingCamera *camera = &tracking->camera;
@@ -1551,16 +1551,16 @@ void BKE_tracking_distort_v2(MovieTracking *tracking, float co[2], float nco[2])
camera->k1, camera->k2, camera->k3, x, y, &x, &y);
/* result is in image coords already */
- nco[0] = x;
- nco[1] = y;
+ r_co[0] = x;
+ r_co[1] = y;
#else
(void) camera;
(void) co;
- (void) nco;
+ zero_v2(r_co);
#endif
}
-void BKE_tracking_undistort_v2(MovieTracking *tracking, float co[2], float nco[2])
+void BKE_tracking_undistort_v2(MovieTracking *tracking, const float co[2], float r_co[2])
{
MovieTrackingCamera *camera = &tracking->camera;
@@ -1571,12 +1571,12 @@ void BKE_tracking_undistort_v2(MovieTracking *tracking, float co[2], float nco[2
libmv_InvertIntrinsics(camera->focal, camera->principal[0], camera->principal[1] * aspy,
camera->k1, camera->k2, camera->k3, x, y, &x, &y);
- nco[0] = x * camera->focal + camera->principal[0];
- nco[1] = y * camera->focal + camera->principal[1] * aspy;
+ r_co[0] = x * camera->focal + camera->principal[0];
+ r_co[1] = y * camera->focal + camera->principal[1] * aspy;
#else
(void) camera;
(void) co;
- (void) nco;
+ zero_v2(r_co);
#endif
}