Commit: a7987b74feea44a185618f8598907c76fbe1e32a
Author: Tianwei Shen
Date:   Fri Jun 3 22:35:20 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBa7987b74feea44a185618f8598907c76fbe1e32a

adapt reconstruction to multiview_reconstruction

===================================================================

M       source/blender/blenkernel/BKE_tracking.h
M       source/blender/editors/space_clip/tracking_ops_correspondence.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_tracking.h 
b/source/blender/blenkernel/BKE_tracking.h
index 6548d95..0ed83de 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -294,6 +294,8 @@ void BKE_tracking_correspondence_unique_name(struct 
ListBase *tracksbase, struct
 struct MovieTrackingCorrespondence *BKE_tracking_correspondence_add(struct 
MovieTracking *tracking, struct ListBase *corr_base,
                                                                     struct 
MovieTrackingTrack *primary_track,
                                                                     struct 
MovieTrackingTrack *witness_track);
+void BKE_tracking_multiview_reconstruction_solve(struct 
MovieMultiviewReconstructContext *context, short *stop, short *do_update,
+                                                 float *progress, char 
*stats_message, int message_size);
 
 #define TRACK_SELECTED(track)               ((track)->flag & SELECT || 
(track)->pat_flag & SELECT || (track)->search_flag & SELECT)
 
diff --git a/source/blender/editors/space_clip/tracking_ops_correspondence.c 
b/source/blender/editors/space_clip/tracking_ops_correspondence.c
index 820f0be..588ffd1 100644
--- a/source/blender/editors/space_clip/tracking_ops_correspondence.c
+++ b/source/blender/editors/space_clip/tracking_ops_correspondence.c
@@ -299,12 +299,12 @@ static void solve_multiview_updatejob(void *scv)
 static void solve_multiview_startjob(void *scv, short *stop, short *do_update, 
float *progress)
 {
        SolveMultiviewJob *scj = (SolveMultiviewJob *)scv;
-       BKE_tracking_reconstruction_solve(scj->context,
-                                         stop,
-                                         do_update,
-                                         progress,
-                                         scj->stats_message,
-                                         sizeof(scj->stats_message));
+       BKE_tracking_multiview_reconstruction_solve(scj->context,
+                                                   stop,
+                                                   do_update,
+                                                   progress,
+                                                   scj->stats_message,
+                                                   sizeof(scj->stats_message));
 }
 
 static void solve_multiview_freejob(void *scv)

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to