[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42651] branches/soc-2011-tomato/source/ blender/editors: Object tracking fixes:

[Sergey Sharybin]

Revision: 42651
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42651
Author:   nazgul
Date:     2011-12-15 16:10:13 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Object tracking fixes:
- Do not draw bundles for object for opengl selection
- Display reconstruction info for active object in cache line and graph editor

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c      
2011-12-15 16:09:57 UTC (rev 42650)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c      
2011-12-15 16:10:13 UTC (rev 42651)
@@ -97,6 +97,7 @@
        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 @@
        }
 
        /* 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);
 

Modified: 
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
===================================================================
--- 
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c    
    2011-12-15 16:09:57 UTC (rev 42650)
+++ 
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c    
    2011-12-15 16:10:13 UTC (rev 42651)
@@ -207,7 +207,7 @@
 {
        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);

Modified: 
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c   
2011-12-15 16:09:57 UTC (rev 42650)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c   
2011-12-15 16:10:13 UTC (rev 42651)
@@ -1487,6 +1487,10 @@
        else {
                float obmat[4][4];
 
+               if(flag & DRAW_PICKING) {
+                       return;
+               }
+
                BKE_tracking_get_interpolated_camera(tracking, tracking_object, 
scene->r.cfra, obmat);
 
                invert_m4_m4(imat, obmat);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs