griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merging r48985 through r48986 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2012-07-16 20:36:09 +00:00
parent 4a6a3e2f98 1f96470b5d
commit 1589454879
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/mask.c
View File

@@ -426,7 +426,7 @@ typedef struct FeatherEdgesBucket {
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) {
@@ -478,24 +478,16 @@ static void feather_bucket_check_intersect(float (*feather_points)[2], int tot_f
}
}
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;
}
}
}