Camera tracking integration

===========================

Additional code clean-up and fixed typo.
No functional changes.

4 files changed, 4 insertions, 4 deletions

diff --git a/extern/libmv/libmv-capi.cpp b/extern/libmv/libmv-capi.cpp
index d728d0b45d7..70985f545b9 100644
--- a/extern/libmv/libmv-capi.cpp
+++ b/extern/libmv/libmv-capi.cpp
@@ -309,7 +309,7 @@ void libmv_regionTrackerDestroy(libmv_RegionTracker *libmv_tracker)
 
 /* ************ Tracks ************ */
 
-void libmv_SADSamplePatternByte(unsigned char *image, int stride,
+void libmv_SADSamplePattern(unsigned char *image, int stride,
 			float warp[3][3], unsigned char *pattern)
 {
 	float mat3[9];
diff --git a/extern/libmv/libmv-capi.h b/extern/libmv/libmv-capi.h
index 87ae90d6ef6..0a7dd0beadf 100644
--- a/extern/libmv/libmv-capi.h
+++ b/extern/libmv/libmv-capi.h
@@ -51,7 +51,7 @@ int libmv_regionTrackerTrack(struct libmv_RegionTracker *libmv_tracker, const fl
 void libmv_regionTrackerDestroy(struct libmv_RegionTracker *libmv_tracker);
 
 /* SAD Tracker */
-void libmv_SADSamplePatternByte(unsigned char *image, int stride,
+void libmv_SADSamplePattern(unsigned char *image, int stride,
 			float warp[3][3], unsigned char *pattern);
 int libmv_SADTrackerTrack(unsigned char *pattern, unsigned char *image, int stride,
 			int width, int height, double *x, double *y);
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 72b9b8f6bbb..5503516fe69 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -23,7 +23,7 @@ from bpy.types import Operator, Panel, Header, Menu
 
 class CLIP_OT_track_to_empty(Operator):
     bl_idname = "clip.track_to_empty"
-    bl_label = "2D Track to Emppty"
+    bl_label = "2D Track to Empty"
     bl_options = {'UNDO', 'REGISTER'}
 
     @classmethod
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index c5a80d1c96f..a1db0eb8dd0 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -949,7 +949,7 @@ int BKE_tracking_next(MovieTrackingContext *context)
 					warp[1][2]= pos[1];
 
 					track_context->pattern= MEM_callocN(sizeof(unsigned char)*16*16, "trackking pattern");
-					libmv_SADSamplePatternByte(image, width, warp, track_context->pattern);
+					libmv_SADSamplePattern(image, width, warp, track_context->pattern);
 
 					MEM_freeN(image);
 					IMB_freeImBuf(ibuf);