[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41728] trunk/blender/source/blender/ editors/space_clip/clip_draw.c: Fixed possible issue drawing undistorted clip in clip editor.

[Sergey Sharybin]

Revision: 41728
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41728
Author:   nazgul
Date:     2011-11-10 12:15:09 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Fixed possible issue drawing undistorted clip in clip editor.
Check for marker's visibility was a bit odd.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_clip/clip_draw.c

Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2011-11-10 
11:33:57 UTC (rev 41727)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2011-11-10 
12:15:09 UTC (rev 41728)
@@ -936,7 +936,8 @@
                                draw_marker_slide_zones(sc, track, marker, 
cur_pos, 1, 0, 0, width, height);
                                draw_marker_slide_zones(sc, track, marker, 
cur_pos, 0, 0, 0, width, height);
 
-                               if(fp) fp+= 2;
+                               if(fp)
+                                       fp+= 2;
                        }
                }
 
@@ -950,20 +951,19 @@
        while(track) {
                if((track->flag&TRACK_HIDDEN)==0) {
                        int act= track==act_track;
+                       marker= BKE_tracking_get_marker(track, framenr);
 
-                       if(!act) {
-                               marker= BKE_tracking_get_marker(track, framenr);
-
-                               if(MARKER_VISIBLE(sc, marker)) {
+                       if(MARKER_VISIBLE(sc, marker)) {
+                               if(!act) {
                                        copy_v2_v2(cur_pos, fp ? fp : 
marker->pos);
 
                                        draw_marker_areas(sc, track, marker, 
cur_pos, width, height, 0, 1);
                                        draw_marker_slide_zones(sc, track, 
marker, cur_pos, 0, 1, 0, width, height);
                                }
+
+                               if(fp)
+                                       fp+= 2;
                        }
-
-                       if(MARKER_VISIBLE(sc, marker) && fp)
-                               fp+= 2;
                }
 
                track= track->next;

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