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

Fix related to T45343: UV unwrap giving poor results for some n-gons.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-02-18 04:16:19 +01:00
parent da81227e54
commit 1a676d4e0e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/uvedit/uvedit_parametrizer.c
View File

@@ -4166,6 +4166,7 @@ static void p_add_ngon(ParamHandle *handle, ParamKey key, int nverts,
while (nverts > 2) { while (nverts > 2) {
float minangle = FLT_MAX; float minangle = FLT_MAX;
float minshape = FLT_MAX;
int i, mini = 0; int i, mini = 0;
/* find corner with smallest angle */ /* find corner with smallest angle */
@@ -4181,8 +4182,20 @@ static void p_add_ngon(ParamHandle *handle, ParamKey key, int nverts,
if (normal && (dot_v3v3(n, normal) < 0.0f)) if (normal && (dot_v3v3(n, normal) < 0.0f))
angle = (float)(2.0 * M_PI) - angle; angle = (float)(2.0 * M_PI) - angle;
if (angle < minangle) { float other_angle = p_vec_angle(co[v2], co[v0], co[v1]);
float shape = fabsf(M_PI - angle - 2.0f * other_angle);
if (fabsf(angle - minangle) < 0.01f) {
/* for nearly equal angles, try to get well shaped triangles */
if (shape < minshape) {
minangle = angle;
minshape = shape;
mini = i;
}
}
else if (angle < minangle) {
minangle = angle; minangle = angle;
minshape = shape;
mini = i; mini = i;
} }
} }