[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40913] branches/soc-2011-tomato/source/ blender/editors/space_clip/tracking_ops.c: Camera tracking integration

[Sergey Sharybin]

Revision: 40913
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40913
Author:   nazgul
Date:     2011-10-10 15:29:31 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fixes for tracking job. Now transform can be started just after tracking job is 
finished.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: 
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c   
2011-10-10 15:24:31 UTC (rev 40912)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c   
2011-10-10 15:29:31 UTC (rev 40913)
@@ -1410,7 +1410,7 @@
        track_markers_initjob(C, tmj, backwards);
 
        /* setup job */
-       steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), sa, "Track 
Markers", WM_JOB_EXCL_RENDER|WM_JOB_PRIORITY|WM_JOB_PROGRESS);
+       steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), sa, "Track 
Markers", WM_JOB_PROGRESS);
        WM_jobs_customdata(steve, tmj, track_markers_freejob);
 
        /* if there's delay set in tracking job, tracking should happen
@@ -1437,7 +1437,7 @@
 {
        /* no running blender, remove handler and pass through */
        if(0==WM_jobs_test(CTX_wm_manager(C), CTX_wm_area(C)))
-               return OPERATOR_FINISHED;
+               return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
 
        /* running tracking */
        switch (event->type) {
@@ -1500,7 +1500,7 @@
        float error;
 
        if(!check_solve_track_count(tracking)) {
-               BKE_report(op->reports, RPT_ERROR, "At least 10 tracks on both 
of keyframes are needed for reconstruction");
+               BKE_report(op->reports, RPT_ERROR, "At least 8 tracks on both 
of keyframes are needed for reconstruction");
                return OPERATOR_CANCELLED;
        }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs