Camera tracking integration: Final pre-merge code clean-up

7 files changed, 9 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b338fcd171..6bc409fe0df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ option(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
 option(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
 
-# Tracking
+# Camera/motion tracking
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
 # Misc
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 35d04c64e14..41fc39c97ac 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -39,7 +39,6 @@ set(SRC
 	libmv-capi.cpp
 	libmv/numeric/numeric.cc
 	libmv/numeric/poly.cc
-	libmv/numeric/tinyvector.cc
 	libmv/simple_pipeline/reconstruction.cc
 	libmv/simple_pipeline/resect.cc
 	libmv/simple_pipeline/intersect.cc
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index b7b0f467728..09209017823 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -394,15 +394,15 @@ class CLIP_PT_display(Panel):
         col.prop(sc, "show_marker_search", text="Search")
         col.prop(sc, "show_pyramid_levels", text="Pyramid")
 
-        col.prop(sc, "show_track_path", text="Path")
+        col.prop(sc, "show_track_path", text="Track Path")
         row = col.row()
         row.active = sc.show_track_path
         row.prop(sc, "path_length", text="Length")
 
-        col.prop(sc, "show_disabled", text="Disabled")
+        col.prop(sc, "show_disabled", "Disabled Tracks")
         col.prop(sc, "show_bundles", text="Bundles")
 
-        col.prop(sc, "show_names", text="Names")
+        col.prop(sc, "show_names", text="Track Names")
         col.prop(sc, "show_tiny_markers", text="Tiny Markers")
 
         col.prop(sc, "show_grease_pencil", text="Grease Pencil")
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 0d97c9ec301..aaed0381b2e 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1190,7 +1190,6 @@ static void emDM_getVert(DerivedMesh *dm, int index, MVert *vert_r)
 
 	/* TODO what to do with vert_r->flag? */
 	vert_r->bweight = (unsigned char) (ev->bweight*255.0f);
-	vert_r->flag= ev->f;
 }
 
 static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 17b9821c431..f904d6e66df 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -52,7 +52,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_lamp_types.h"
+
 #include "DNA_lattice_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_text_types.h"
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index eaed80e6bb0..79930fdd8bf 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -643,7 +643,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
 		if(!cti)
 			continue;
 
-		/* special case for FollowTrack -- it doesn't use targets to define relations */
+		/* special case for camera tracking -- it doesn't use targets to define relations */
 		if(ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER)) {
 			if(cti->type==CONSTRAINT_TYPE_FOLLOWTRACK) {
 				bFollowTrackConstraint *data= (bFollowTrackConstraint *)con->data;
@@ -2148,7 +2148,7 @@ static void dag_object_time_update_flags(Object *ob)
 			bConstraintTarget *ct;
 			
 			if (cti) {
-				/* special case for FollowTrack -- it doesn't use targets to define relations */
+				/* special case for camera tracking -- it doesn't use targets to define relations */
 				if(ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER)) {
 					ob->recalc |= OB_RECALC_OB;
 				}
@@ -2563,8 +2563,8 @@ static void dag_id_flush_update(Scene *sce, ID *id)
 
 		/* camera's matrix is used to orient reconstructed stuff,
 		   so it should happen tracking-related constraints recalculation
-		   when camera is changing */
-		if(sce->camera && &sce->camera->id == id && sce->clip) {
+		   when camera is changing (sergey) */
+		if(sce->camera && &sce->camera->id == id && object_get_movieclip(sce, sce->camera, 1)) {
 			dag_id_flush_update(sce, &sce->clip->id);
 		}
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3f6cf343500..9f6ce4eb79b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12323,7 +12323,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	{
 		{
 			bScreen *sc;
-			Camera *cam;
 			MovieClip *clip;
 
 			for (sc= main->screen.first; sc; sc= sc->id.next) {
@@ -12350,14 +12349,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				}
 			}
 
-			for(cam= main->camera.first; cam; cam= cam->id.next) {
-				if (cam->sensor_x < 0.01)
-					cam->sensor_x = DEFAULT_SENSOR_WIDTH;
-
-				if (cam->sensor_y < 0.01)
-					cam->sensor_y = DEFAULT_SENSOR_HEIGHT;
-			}
-
 			for (clip= main->movieclip.first; clip; clip= clip->id.next) {
 				MovieTrackingTrack *track;