archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 52815.

Browse Source
This commit is contained in:
Tamito Kajiyama
2012-12-08 12:35:14 +00:00
parent 724746dba2 7b9adab594
commit ec33687d6c
179 changed files with 7153 additions and 5305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/bmesh/operators/bmo_connect.c
View File

@@ -382,18 +382,19 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op)
/* compute summed length between vertices in forward direction */
len = 0.0f;
for (j = 0; j < lenv2; j++) {
for (j = 0; (j < lenv2) && (len < min); j++) {
len += len_v3v3(vv1[clamp_index(i + j, lenv1)]->co, vv2[j]->co);
}
if (len < min) {
min = len;
starti = i;
dir1 = 1;
}
/* compute summed length between vertices in backward direction */
len = 0.0f;
for (j = 0; j < lenv2; j++) {
for (j = 0; (j < lenv2) && (len < min); j++) {
len += len_v3v3(vv1[clamp_index(i - j, lenv1)]->co, vv2[j]->co);
}