[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48986] trunk/blender/source/blender/ blenkernel/intern/mask.c: Correction for last commit, now shortest-loop-collapser seems to be working rock-solid

[Sergey Sharybin]

Revision: 48986
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48986
Author:   nazgul
Date:     2012-07-16 20:35:26 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Correction for last commit, now shortest-loop-collapser seems to be working 
rock-solid

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask.c

Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c       2012-07-16 
19:24:25 UTC (rev 48985)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c       2012-07-16 
20:35:26 UTC (rev 48986)
@@ -411,7 +411,7 @@
 
 static void feather_bucket_add_edge(FeatherEdgesBucket *bucket, int start, int 
end)
 {
-       const int alloc_delta = 20;
+       const int alloc_delta = 32;
 
        if (bucket->tot_segment >= bucket->alloc_segment) {
                if (!bucket->segments) {
@@ -463,24 +463,16 @@
                                }
                        }
                        else {
-                               if (cur_b < check_a) {
-                                       /* special case when intersection 
happens with first segment */
-                                       for (k = cur_b; k <= check_a; k++) {
-                                               copy_v2_v2(feather_points[k], 
p);
-                                       }
+                               for (k = 0; k <= check_a; k++) {
+                                       copy_v2_v2(feather_points[k], p);
                                }
-                               else {
-                                       for (k = 0; k <= check_a; k++) {
-                                               copy_v2_v2(feather_points[k], 
p);
-                                       }
 
+                               if (cur_b != 0) {
                                        for (k = cur_b; k < tot_feather_point; 
k++) {
                                                copy_v2_v2(feather_points[k], 
p);
                                        }
                                }
                        }
-
-                       break;
                }
        }
 }

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