Camera tracking integration
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jul 2011 19:27:14 +0000 (19:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jul 2011 19:27:14 +0000 (19:27 +0000)
===========================

- Disallow negative size for bundles.
- Fixed bug with passing disabled markers to solver.

source/blender/blenkernel/intern/tracking.c
source/blender/makesrna/intern/rna_space.c

index 93b4e4a3bff95b561a0888e1d03a31299c69c1b0..78f0026ae49f4fa417f1ea2c069960c878f83c05 100644 (file)
@@ -698,7 +698,8 @@ static struct libmv_Tracks *create_libmv_tracks(MovieClip *clip)
                for(a= 0; a<track->markersnr; a++) {
                        MovieTrackingMarker *marker= &track->markers[a];
 
-                       libmv_tracksInsert(tracks, marker->framenr, tracknr, marker->pos[0]*width, marker->pos[1]*height);
+                       if((marker->flag&MARKER_DISABLED)==0)
+                               libmv_tracksInsert(tracks, marker->framenr, tracknr, marker->pos[0]*width, marker->pos[1]*height);
                }
 
                track= track->next;
index c8a36f03a3ae3d4c61e9cb37dfe942c7160f6736..35813329a0c1925a6bfc0f124fe46a5e20364ce5 100644 (file)
@@ -1438,6 +1438,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
        prop= RNA_def_property(srna, "bundle_size", PROP_FLOAT, PROP_NONE);
+       RNA_def_property_range(prop, 0.0, FLT_MAX);
        RNA_def_property_float_sdna(prop, NULL, "bundle_size");
        RNA_def_property_ui_text(prop, "Bundle Size", "Display size of bundles from reconstructed data");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);