[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38394] branches/soc-2011-tomato/source/ blender: Camera tracking integration

[Sergey Sharybin]

Revision: 38394
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38394
Author:   nazgul
Date:     2011-07-14 13:36:15 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

Enable markers on transform

Modified Paths:
--------------
    
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h

Modified: 
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
===================================================================
--- 
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
   2011-07-14 13:26:23 UTC (rev 38393)
+++ 
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
   2011-07-14 13:36:15 UTC (rev 38394)
@@ -5249,24 +5249,19 @@
 {
        MovieTrackingMarker *marker= BKE_tracking_ensure_marker(track, 
sc->user.framenr);
 
-       if((marker->flag&MARKER_DISABLED)==0) {
-               if(track->flag&SELECT)
-                       markerToTransDataInit(td++, td2d++, marker->pos, NULL);
+       track->transflag= marker->flag;
 
-               if(track->pat_flag&SELECT) {
-                       markerToTransDataInit(td++, td2d++, track->pat_min, 
marker->pos);
-                       markerToTransDataInit(td++, td2d++, track->pat_max, 
marker->pos);
-               }
-       }
+       marker->flag&= ~MARKER_DISABLED;
 
-       if(track->search_flag&SELECT) {
-               if(marker->flag&MARKER_DISABLED) {
-                       markerToTransDataInit(td++, td2d++, marker->pos, NULL);
+       if(track->flag&SELECT)
+               markerToTransDataInit(td++, td2d++, marker->pos, NULL);
 
-                       markerToTransDataInit(td++, td2d++, track->pat_min, 
marker->pos);
-                       markerToTransDataInit(td++, td2d++, track->pat_max, 
marker->pos);
-               }
+       if(track->pat_flag&SELECT) {
+               markerToTransDataInit(td++, td2d++, track->pat_min, 
marker->pos);
+               markerToTransDataInit(td++, td2d++, track->pat_max, 
marker->pos);
+       }
 
+       if(track->search_flag&SELECT) {
                markerToTransDataInit(td++, td2d++, track->search_min, 
marker->pos);
                markerToTransDataInit(td++, td2d++, track->search_max, 
marker->pos);
        }

Modified: 
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
===================================================================
--- 
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c  
    2011-07-14 13:26:23 UTC (rev 38393)
+++ 
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c  
    2011-07-14 13:36:15 UTC (rev 38394)
@@ -848,6 +848,18 @@
                SpaceClip *sc= t->sa->spacedata.first;
                MovieClip *clip= ED_space_clip(sc);
                MovieTrackingTrack *track;
+
+               if(t->state == TRANS_CANCEL) {
+                       track= clip->tracking.tracks.first;
+                       while(track) {
+                               MovieTrackingMarker *marker= 
BKE_tracking_ensure_marker(track, sc->user.framenr);
+
+                               marker->flag= track->transflag;
+
+                               track= track->next;
+                       }
+               }
+
                flushTransTracking(t);
 
                track= clip->tracking.tracks.first;

Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h       
2011-07-14 13:26:23 UTC (rev 38393)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h       
2011-07-14 13:36:15 UTC (rev 38394)
@@ -93,6 +93,9 @@
 
        /* ** UI editing ** */
        int flag, pat_flag, search_flag;        /* flags (selection, ...) */
+       short transflag;                                        /* transform 
flags */
+
+       char pad3[6];
 } MovieTrackingTrack;
 
 typedef struct MovieTrackingSettings {

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