forked from bartvdbraak/blender
Camera tracking integration
=========================== - Code cleanup. - Fixed small bug with cleanup operator.
This commit is contained in:
parent
e19e29481c
commit
6752fe77ec
@ -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;
|
||||
|
@ -1081,7 +1081,6 @@ static int reconstruction_camera_index(MovieTracking *tracking, int framenr, int
|
||||
|
||||
while(a>=0 && a<reconstruction->camnr) {
|
||||
int cfra= cameras[a].framenr;
|
||||
int ok= cfra==framenr;
|
||||
|
||||
/* check if needed framenr was "skipped" -- no data for requested frame */
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user