Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-11-09 08:01:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-09 08:01:19 +0400
commit11a5c909f86e26ff00883be4b1dfcdac1f699717 (patch)
tree13c13b4156188783eab2d99c06cee048da58ef50 /source/blender/bmesh/operators/bmo_bevel.c
parentcf08068e10040a3f4d5548bfcb4e4940d2f75d8d (diff)
code cleanup: move shrinkwrap's benchmark macro into PIL_time.h & some minor style edits.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_bevel.c')
-rw-r--r--source/blender/bmesh/operators/bmo_bevel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index 16108bda80c..8ced18d6d90 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -510,7 +510,7 @@ static int find_intersection_point(float r[3], float a1[3], float a2[3], float b
static void find_intersection_point_plane(float r[3], float p1[3], float p2[3], float p3[3],
float a[3], float m[3])
{
- const double null = 1e-20;
+ const double isect_epsilon = 1e-20;
float P[3], N[3], A[3], M[3];
float vv1[3], vv2[3];
double t;
@@ -542,9 +542,9 @@ static void find_intersection_point_plane(float r[3], float p1[3], float p2[3],
else {
C = N[0] * P[0] + N[1] * P[1] + N[2] * P[2];
D = N[0] * M[0] + N[1] * M[1] + N[2] * M[2];
- E = (A[0] * N[0] + A[1] * N[1] + A[2] * N[2]);
+ E = A[0] * N[0] + A[1] * N[1] + A[2] * N[2];
- if (fabs(E) < null)
+ if (fabs(E) < isect_epsilon)
t = 0;
else
t = (C - D) / E;