[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48930] trunk/blender/source/blender: fix for minor error in previous commit ( wasnt connecting right faces for cyclic mask), also avoid doing more area calculations then needed when checking if the mouse is moving away from uiBlock .

[Campbell Barton]

Revision: 48930
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48930
Author:   campbellbarton
Date:     2012-07-14 23:26:54 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
fix for minor error in previous commit (wasnt connecting right faces for cyclic 
mask), also avoid doing more area calculations then needed when checking if the 
mouse is moving away from uiBlock.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c     
2012-07-14 23:23:24 UTC (rev 48929)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c     
2012-07-14 23:26:54 UTC (rev 48930)
@@ -760,16 +760,16 @@
                                }
 
                                if 
(open_spline_ranges[open_spline_index].is_cyclic) {
-                                       *(face++) = start_vidx + 3; /* next 
span */ /* z 1 */
+                                       *(face++) = start_vidx + 0; /* next 
span */ /* z 1 */
                                        *(face++) = j          + 0;             
    /* z 1 */
                                        *(face++) = j          + 1;             
    /* z 0 */
-                                       *(face++) = start_vidx + 4; /* next 
span */ /* z 0 */
+                                       *(face++) = start_vidx + 1; /* next 
span */ /* z 0 */
 
                                        face_index++;
 
                                        *(face++) = j          + 0;             
    /* z 1 */
-                                       *(face++) = start_vidx + 3; /* next 
span */ /* z 1 */
-                                       *(face++) = start_vidx + 5; /* next 
span */ /* z 0 */
+                                       *(face++) = start_vidx + 0; /* next 
span */ /* z 1 */
+                                       *(face++) = start_vidx + 2; /* next 
span */ /* z 0 */
                                        *(face++) = j          + 2;             
    /* z 0 */
 
                                        face_index++;

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 
2012-07-14 23:23:24 UTC (rev 48929)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 
2012-07-14 23:26:54 UTC (rev 48930)
@@ -5937,14 +5937,13 @@
        newp[0] = mx;
        newp[1] = my;
 
-       if (len_v2v2(oldp, newp) < 4.0f)
+       if (len_squared_v2v2(oldp, newp) < (4.0f * 4.0f))
                return menu->dotowards;
 
-       closer = 0;
-       closer |= isect_point_tri_v2(newp, oldp, p1, p2);
-       closer |= isect_point_tri_v2(newp, oldp, p2, p3);
-       closer |= isect_point_tri_v2(newp, oldp, p3, p4);
-       closer |= isect_point_tri_v2(newp, oldp, p4, p1);
+       closer = (isect_point_tri_v2(newp, oldp, p1, p2) ||
+                 isect_point_tri_v2(newp, oldp, p2, p3) ||
+                 isect_point_tri_v2(newp, oldp, p3, p4) ||
+                 isect_point_tri_v2(newp, oldp, p4, p1));
 
        if (!closer)
                menu->dotowards = 0;

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