[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37917] branches/soc-2011-salad: Merging r37912 through r37915 from soc-2011-tomato into soc-2011-salad

[Sergey Sharybin]

Revision: 37917
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37917
Author:   nazgul
Date:     2011-06-28 16:25:57 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Merging r37912 through r37915 from soc-2011-tomato into soc-2011-salad

Revision Links:
--------------
    
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37912
    
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37915

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37911
/trunk/blender:36834-37910
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37915
/trunk/blender:36834-37910

Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c 
2011-06-28 16:25:07 UTC (rev 37916)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c 
2011-06-28 16:25:57 UTC (rev 37917)
@@ -558,7 +558,7 @@
        while(track) {
                MovieTrackingMarker *marker= BKE_tracking_get_marker(track, 
curfra);
 
-               if(marker && marker->framenr==curfra) {
+               if(marker && (marker->flag&MARKER_DISABLED)==0 && 
marker->framenr==curfra) {
 #ifdef WITH_LIBMV
                        int width, height, pos[2];
                        float *patch= acquire_search_floatbuf(ibuf, track, 
marker, &width, &height, pos);

Modified: branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c       
2011-06-28 16:25:07 UTC (rev 37916)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c       
2011-06-28 16:25:57 UTC (rev 37917)
@@ -127,7 +127,7 @@
                                if(framenr!=i) glColor4ub(128, 128, 0, 96);
                                else glColor4ub(255, 255, 0, 96);
 
-                               glRecti((i-sfra-1)*framelen, 0, 
(i-sfra)*framelen, 4);
+                               glRecti((i-sfra)*framelen, 0, 
(i-sfra+1)*framelen, 4);
                        }
                }
        }

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