Camera tracking integration: Final pre-merge code clean-up
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 Nov 2011 12:50:26 +0000 (12:50 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 Nov 2011 12:50:26 +0000 (12:50 +0000)
CMakeLists.txt
extern/libmv/CMakeLists.txt
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/readfile.c

index 1b338fcd17126d78e49f531f8aa6cfc052aae5d2..6bc409fe0df5d056beb1fb7c10da9a995999abfd 100644 (file)
@@ -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
index 35d04c64e141ef3257af323c5b8db078e0cc1aad..41fc39c97aceb816dfbd667088c12f5412fb1643 100644 (file)
@@ -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
index b7b0f467728c377225408657b5b28f6e47cc7387..09209017823e270ea4011361e6fad29a26a61d9d 100644 (file)
@@ -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")
index 0d97c9ec301dc26b8082af6f8a685e5b973e95e6..aaed0381b2e3a0707082658bdb1e1ef55aa9be61 100644 (file)
@@ -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)
index 17b9821c431dfd139badf4dba7d32c93c62962ee..f904d6e66df6982ea18384d574696b0de9169163 100644 (file)
@@ -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"
index eaed80e6bb047981d0a2175373798249d7c3f28c..79930fdd8bfc5dc204fbd61723eeb022b96afa59 100644 (file)
@@ -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);
                }
 
index 3f6cf34350072beee85f188920149cec69feab40..9f6ce4eb79b36bbab3c693b06b1ff11176b644b5 100644 (file)
@@ -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;