diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
| commit | 25024d948298a9f3f3210a0b91486f79a3917b0f (patch) | |
| tree | 5647623b9781193b7ed55c8d9233404938aeb853 /src/glu/sgi/libnurbs/nurbtess/partitionY.cc | |
| parent | d14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 (diff) | |
| parent | 195e7657e2f15f7ad8b22042b86bcf33c5bba76b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
Diffstat (limited to 'src/glu/sgi/libnurbs/nurbtess/partitionY.cc')
| -rw-r--r-- | src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glu/sgi/libnurbs/nurbtess/partitionY.cc b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc index 297c629976..e097461ac5 100644 --- a/src/glu/sgi/libnurbs/nurbtess/partitionY.cc +++ b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc @@ -111,8 +111,8 @@ Int isCusp(directedLine *v) else if(A[1] > B[1] && C[1] > B[1]) return 1; - if(isAbove(v, v) && isAbove(v, v->getPrev()) || - isBelow(v, v) && isBelow(v, v->getPrev())) + if((isAbove(v, v) && isAbove(v, v->getPrev())) || + (isBelow(v, v) && isBelow(v, v->getPrev()))) return 1; else return 0; |