diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
| commit | 78a4e2461419f026d53e409cb75073ba5f47e1bb (patch) | |
| tree | 2847f536bee9b51a0d30f59baf6becc22a8acffd /source/blender/editors/space_view3d/view3d_snap.c | |
| parent | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (diff) | |
| parent | bac6757ea0b1c873b8dd8221592ea95eed8d5bac (diff) | |
svn merge ^/trunk/blender -r43009:43033
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_snap.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 1f1a17ce5cd..85ddc41039c 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -817,18 +817,15 @@ void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot) static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) { MovieClip *clip= object_get_movieclip(scene, ob, 0); - MovieTracking *tracking= &clip->tracking; - MovieTrackingObject *object= tracking->objects.first; + MovieTracking *tracking; + MovieTrackingObject *object; int ok= 0; - float min[3], max[3], mat[4][4], pos[3], cammat[4][4]; + float min[3], max[3], mat[4][4], pos[3], cammat[4][4] = MAT4_UNITY; if(!clip) return; - unit_m4(cammat); - - if(!scene->camera) - scene->camera= scene_find_camera(scene); + tracking= &clip->tracking; if(scene->camera) copy_m4_m4(cammat, scene->camera->obmat); @@ -837,7 +834,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) INIT_MINMAX(min, max); - while(object) { + for (object= tracking->objects.first; object; object= object->next) { ListBase *tracksbase= BKE_tracking_object_tracks(tracking, object); MovieTrackingTrack *track= tracksbase->first; float obmat[4][4]; @@ -863,8 +860,6 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) track= track->next; } - - object= object->next; } if(ok) { |