diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-15 19:47:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-15 19:47:32 +0400 |
| commit | 630798ba3c47ee8d1cead13ee0494b9645f139f7 (patch) | |
| tree | 6821413d55f37a3f94d38b389537773431f58d36 /source | |
| parent | ee2b7b2c683ae9164be181193cd7ca9af27ebd0f (diff) | |
add in ifdef for WITH_LIBMV, correct own error passing float[2] as float[3]
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 3100917cd0c..df10d1374bb 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1462,7 +1462,9 @@ MovieDistortion *BKE_tracking_distortion_new(void) distortion = MEM_callocN(sizeof(MovieDistortion), "BKE_tracking_distortion_create"); +#ifdef WITH_LIBMV distortion->intrinsics = libmv_CameraIntrinsicsNewEmpty(); +#endif return distortion; } diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index ed27016cf67..45deab2d8de 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -3297,8 +3297,8 @@ static bool edbm_mesh_knife_face_isect(ARegion *ar, LinkNode *polys, BMFace *f, add_v3_v3v3(co_b, co_a, tangent); } - ED_view3d_project_float_v3_m4(ar, co_a, co_ss_a, projmat); - ED_view3d_project_float_v3_m4(ar, co_b, co_ss_b, projmat); + ED_view3d_project_float_v2_m4(ar, co_a, co_ss_a, projmat); + ED_view3d_project_float_v2_m4(ar, co_b, co_ss_b, projmat); interp_v2_v2v2(co_ss, co_ss_a, co_ss_b, 0.005f); /* check */ |