[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39197] branches/soc-2011-tomato/source/ blender: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Mon Aug 8 22:25:00 CEST 2011
Revision: 39197
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39197
Author: nazgul
Date: 2011-08-08 20:25:00 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
- Code cleanup.
- Fixed small bug with cleanup operator.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -4118,7 +4118,6 @@
Scene *scene= cob->scene;
bCameraSolverConstraint *data= con->data;
MovieClip *clip= data->clip;
- MovieReconstructedCamera *camera;
if(data->flag&CAMERASOLVER_DEFAULTCLIP)
clip= scene->clip;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -1081,7 +1081,6 @@
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 */
Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -4075,9 +4075,8 @@
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;
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-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -2734,9 +2734,10 @@
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;
Modified: branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -1246,7 +1246,6 @@
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;
Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -401,7 +401,7 @@
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 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,
Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -253,7 +253,7 @@
}
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 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;
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -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;
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c 2011-08-08 19:02:18 UTC (rev 39196)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c 2011-08-08 20:25:00 UTC (rev 39197)
@@ -81,7 +81,7 @@
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_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 @@
*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;
More information about the Bf-blender-cvs
mailing list