diff options
author | Brian Paul <brianp@vmware.com> | 2009-12-27 15:31:08 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-12-27 15:31:08 -0700 |
commit | d0b7ff551ab25153e3023871af3daa65b394a828 (patch) | |
tree | cfff232421273b15820b4ab6773219ba676e52d5 /src/glu/sgi/libnurbs/nurbtess/partitionY.cc | |
parent | 7831515e69ac875b1ac0b1b248ab10c6cf37bf52 (diff) | |
parent | da876fa3a5df77763fe106b5e0a17b2e672a506c (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
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; |