Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-12-15 20:10:13 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-12-15 20:10:13 +0400
commit53f37cd1edb6e4aa5ea1c8a0da2c466e0cad497c (patch)
tree2bce704ce0a66254b5cafa10d0f5da40f2a667ae /source/blender/editors/space_clip
parentba16e7d631ad0fa5ae7add9bc5f0590c3d23e778 (diff)
Object tracking fixes:
- Do not draw bundles for object for opengl selection - Display reconstruction info for active object in cache line and graph editor
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c7
-rw-r--r--source/blender/editors/space_clip/clip_graph_draw.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 8f2398b156b..ca2646e9967 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -97,6 +97,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
int *points, totseg, i, a;
float sfra= SFRA, efra= EFRA, framelen= ar->winx/(efra-sfra+1);
MovieTrackingTrack *act_track= BKE_tracking_active_track(&clip->tracking);
+ MovieTrackingReconstruction *reconstruction= BKE_tracking_get_reconstruction(&clip->tracking);
glEnable(GL_BLEND);
@@ -153,9 +154,9 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
}
/* failed frames */
- if(clip->tracking.reconstruction.flag&TRACKING_RECONSTRUCTED) {
- int n= clip->tracking.reconstruction.camnr;
- MovieReconstructedCamera *cameras= clip->tracking.reconstruction.cameras;
+ if(reconstruction->flag&TRACKING_RECONSTRUCTED) {
+ int n= reconstruction->camnr;
+ MovieReconstructedCamera *cameras= reconstruction->cameras;
glColor4ub(255, 0, 0, 96);
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 93aba356c9a..9aba6db0c80 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -207,7 +207,7 @@ static void draw_frame_curves(SpaceClip *sc)
{
MovieClip *clip= ED_space_clip(sc);
MovieTracking *tracking= &clip->tracking;
- MovieTrackingReconstruction *reconstruction= &tracking->reconstruction;
+ MovieTrackingReconstruction *reconstruction= BKE_tracking_get_reconstruction(tracking);
int i, lines= 0, prevfra= 0;
glColor3f(0.0f, 0.0f, 1.0f);