[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47639] branches/soc-2011-tomato/source/ blender: Fixed crash in previous commit when track preview is drawing for missed frame

[Sergey Sharybin]

Revision: 47639
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47639
Author:   nazgul
Date:     2012-06-09 11:34:22 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
Fixed crash in previous commit when track preview is drawing for missed frame

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c        
2012-06-09 11:14:36 UTC (rev 47638)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c        
2012-06-09 11:34:22 UTC (rev 47639)
@@ -1246,7 +1246,7 @@
 
 ImBuf *BKE_tracking_sample_pattern_imbuf(int frame_width, int frame_height,
                                          ImBuf *search_ibuf, 
MovieTrackingMarker *marker,
-                                                                               
 int num_samples_x, int num_samples_y, float pos[2])
+                                         int num_samples_x, int num_samples_y, 
float pos[2])
 {
        ImBuf *pattern_ibuf;
        double src_pixel_x[5], src_pixel_y[5];

Modified: 
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c  
2012-06-09 11:14:36 UTC (rev 47638)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c  
2012-06-09 11:34:22 UTC (rev 47639)
@@ -1513,8 +1513,9 @@
 
                ok = 1;
        }
-       else if ((!scopes->track_preview) ||
-             (scopes->track_preview->x != width || scopes->track_preview->y != 
height))
+       else if ((scopes->track_search) &&
+                ((!scopes->track_preview) ||
+                (scopes->track_preview->x != width || scopes->track_preview->y 
!= height)))
        {
                ImBuf *tmpibuf;
 

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