[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55309] trunk/blender/source/blender: add in ifdef for WITH_LIBMV, correct own error passing float[2] as float[3 ]

[Campbell Barton]

Revision: 55309
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55309
Author:   campbellbarton
Date:     2013-03-15 15:47:32 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
add in ifdef for WITH_LIBMV, correct own error passing float[2] as float[3]

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-03-15 15:13:34 UTC (rev 55308)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-03-15 15:47:32 UTC (rev 55309)
@@ -1462,7 +1462,9 @@
 
 	distortion = MEM_callocN(sizeof(MovieDistortion), "BKE_tracking_distortion_create");
 
+#ifdef WITH_LIBMV
 	distortion->intrinsics = libmv_CameraIntrinsicsNewEmpty();
+#endif
 
 	return distortion;
 }

Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-03-15 15:13:34 UTC (rev 55308)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-03-15 15:47:32 UTC (rev 55309)
@@ -3297,8 +3297,8 @@
 		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 */