diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-26 15:17:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-26 15:17:01 +0400 |
| commit | 1c29fd77d31318fae9d72c5560bfdf0aa742cc3d (patch) | |
| tree | 14b9a1e2811edd8edfe3db605adc537e19ab8b85 /source/blender/bmesh | |
| parent | 97aab5acc4a397c73868b9f960e706153ac73f2e (diff) | |
Code Cleanup: style and correct API class ref
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 1071f2522ca..612740baa94 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1122,7 +1122,7 @@ static void superellipse_co(float u, float r, float r_co[2]) if (u <= 0.0f) { r_co[0] = 0.0f; r_co[1] = 1.0f; - } + } else if (u >= 2.0f) { r_co[0] = 1.0f; r_co[1] = 0.0f; @@ -3118,7 +3118,7 @@ static void build_vmesh(BevelParams *bp, BMesh *bm, BevVert *bv) copy_v3_v3(co, vb); } else if (weld2->profile.super_r == PRO_LINE_R && - weld1->profile.super_r != PRO_LINE_R) + weld1->profile.super_r != PRO_LINE_R) { copy_v3_v3(co, va); } @@ -3677,7 +3677,7 @@ static void find_even_superellipse_params(int n, float r, float *r_params) /* n is odd, so get one corner-cut chord. * Solve u == sqrt(2*(1-n2*u)^2) where n2 = floor(n/2) */ n2 = n / 2; - u = (2.0f * n2 - M_SQRT2) / (2.0f * n2 * n2 - 1); + u = (2.0f * n2 - (float)M_SQRT2) / (2.0f * n2 * n2 - 1.0f); for (i = 0; i < n; i++) r_params[i] = i * u; r_params[n] = umax; |