From 6752fe77ec9e3e9a2ecddaac085c022a731c3794 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 8 Aug 2011 20:25:00 +0000 Subject: [PATCH] Camera tracking integration =========================== - Code cleanup. - Fixed small bug with cleanup operator. --- source/blender/blenkernel/intern/constraint.c | 1 - source/blender/blenkernel/intern/tracking.c | 1 - source/blender/editors/interface/interface_handlers.c | 3 +-- source/blender/editors/space_clip/tracking_ops.c | 3 ++- source/blender/editors/space_view3d/view3d_draw.c | 1 - source/blender/imbuf/intern/indexer.c | 4 ++-- source/blender/imbuf/intern/indexer_dv.c | 4 ++-- source/blender/makesrna/intern/rna_movieclip.c | 2 +- source/blender/makesrna/intern/rna_tracking.c | 6 +++--- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 4ab12557971..c771754b066 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -4118,7 +4118,6 @@ static void camerasolver_evaluate (bConstraint *con, bConstraintOb *cob, ListBas Scene *scene= cob->scene; bCameraSolverConstraint *data= con->data; MovieClip *clip= data->clip; - MovieReconstructedCamera *camera; if(data->flag&CAMERASOLVER_DEFAULTCLIP) clip= scene->clip; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 2a6d6e88c62..a90d3d09b05 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1081,7 +1081,6 @@ static int reconstruction_camera_index(MovieTracking *tracking, int framenr, int while(a>=0 && acamnr) { int cfra= cameras[a].framenr; - int ok= cfra==framenr; /* check if needed framenr was "skipped" -- no data for requested frame */ diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 9da2bbbed39..628ca196c0a 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4075,9 +4075,8 @@ static int ui_do_but_LINK(bContext *C, uiBut *but, uiHandleButtonData *data, wmE static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonData *data, int mx, int my, int shift) { MovieClipScopes *scopes = (MovieClipScopes *)but->poin; - /* rcti rect; */ int changed= 1; - float dx, dy, yfac=1.f; + float dx, dy; dx = mx - data->draglastx; dy = my - data->draglasty; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index a11d776c4db..f7c4ff8442e 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -2734,9 +2734,10 @@ static int clean_tracks_exec(bContext *C, wmOperator *op) track= tracking->tracks.first; while(track) { + next= track->next; + if((track->flag&TRACK_HIDDEN)==0 && (track->flag&TRACK_LOCKED)==0) { int ok= 1; - next= track->next; ok&= is_track_clean(track, frames, action==2); ok&= error == 0.f || (track->flag&TRACK_HAS_BUNDLE)==0 || track->error < error; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index d5f8bce2970..9832406a3aa 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1246,7 +1246,6 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) if (ca && (ca->flag & CAM_SHOWSENSOR)) { /* assume fixed sensor width for now */ - float sensor_aspect = ca->sensor_x / ca->sensor_y; float sensor_scale = (x2i-x1i) / ca->sensor_x; float sensor_height = sensor_scale * ca->sensor_y; diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 0247d5e88d3..dda9440ffb5 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -401,7 +401,7 @@ static int round_up(int x, int mod) static struct proxy_output_ctx * alloc_proxy_output_ffmpeg( struct anim * anim, AVStream * st, int proxy_size, int width, int height, - int quality) + int UNUSED(quality)) { struct proxy_output_ctx * rv = MEM_callocN( sizeof(struct proxy_output_ctx), "alloc_proxy_output"); @@ -862,7 +862,7 @@ static AviMovie * alloc_proxy_output_avi( } static void index_rebuild_fallback(struct anim * anim, - IMB_Timecode_Type tcs_in_use, + IMB_Timecode_Type UNUSED(tcs_in_use), IMB_Proxy_Size proxy_sizes_in_use, int quality, short *stop, short *do_update, diff --git a/source/blender/imbuf/intern/indexer_dv.c b/source/blender/imbuf/intern/indexer_dv.c index 0d984aaecd8..5cdbf8d70d2 100644 --- a/source/blender/imbuf/intern/indexer_dv.c +++ b/source/blender/imbuf/intern/indexer_dv.c @@ -253,7 +253,7 @@ static void fill_gap(indexer_dv_context * This, int isPAL) } static void proc_frame(indexer_dv_context * This, - unsigned char* framebuffer, int isPAL) + unsigned char* UNUSED(framebuffer), int isPAL) { struct tm recDate; time_t t; @@ -303,7 +303,7 @@ static void proc_frame(indexer_dv_context * This, static void indexer_dv_proc_frame(anim_index_builder * idx, unsigned char * buffer, - int data_size, + int UNUSED(data_size), struct anim_index_entry * entry) { int isPAL; diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index 326c4a0a1ad..2e4fe3d40db 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -52,7 +52,7 @@ #include "BKE_depsgraph.h" -static void rna_MovieClip_reload_update(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_MovieClip_reload_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { MovieClip *clip= (MovieClip*)ptr->data; diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 3af443115f7..3ebb64724c3 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -81,7 +81,7 @@ void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value) BKE_track_unique_name(&clip->tracking, track); } -static void rna_tracking_trackerPattern_update(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_tracking_trackerPattern_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { MovieClip *clip= (MovieClip*)ptr->id.data; MovieTrackingTrack *track; @@ -94,7 +94,7 @@ static void rna_tracking_trackerPattern_update(Main *bmain, Scene *scene, Pointe } } -static void rna_tracking_trackerSearch_update(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_tracking_trackerSearch_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { MovieClip *clip= (MovieClip*)ptr->id.data; MovieTrackingTrack *track; @@ -185,7 +185,7 @@ static void rna_tracking_stabTracks_active_index_range(PointerRNA *ptr, int *min *max= MAX2(0, *max); } -static void rna_tracking_flushUpdate(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_tracking_flushUpdate(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr) { MovieClip *clip= (MovieClip*)ptr->id.data; MovieTrackingStabilization *stab= &clip->tracking.stabilization;