Revision: 40267
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40267
Author: nazgul
Date: 2011-09-16 14:57:50 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================
Made SAD tracker default.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
2011-09-16 14:47:32 UTC (rev 40266)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
2011-09-16 14:57:50 UTC (rev 40267)
@@ -344,6 +344,7 @@
clip->tracking.camera.pixel_aspect= 1.0f;
clip->tracking.camera.units= CAMERA_UNITS_MM;
+ clip->tracking.settings.tracker= TRACKER_SAD;
clip->tracking.settings.frames_limit= 0;
clip->tracking.settings.keyframe1= 1;
clip->tracking.settings.keyframe2= 30;
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
2011-09-16 14:47:32 UTC (rev 40266)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
2011-09-16 14:57:50 UTC (rev 40267)
@@ -224,8 +224,8 @@
PropertyRNA *prop;
static EnumPropertyItem tracker_items[] = {
+ {TRACKER_SAD, "SAD", 0, "SAD", "Sum of Absolute Differences
tracker"},
{TRACKER_KLT, "KLT", 0, "KLT", "Kanade–Lucas–Tomasi racker"},
- {TRACKER_SAD, "SAD", 0, "SAD", "Sum of Absolute Differences
tracker"},
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem speed_items[] = {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
