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/sampleCompBot.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/sampleCompBot.cc')
| -rw-r--r-- | src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc b/src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc index e12f88bab1..2e70f83936 100644 --- a/src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc +++ b/src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc @@ -207,7 +207,7 @@ void sampleBotRightWithGridLine(Real* botVertex, return; } - Int segIndexMono, segIndexPass; + Int segIndexMono = 0, segIndexPass; findBotRightSegment(rightChain, rightEnd, rightCorner, @@ -293,7 +293,7 @@ void sampleBotLeftWithGridLine(Real* botVertex, return; } - Int segIndexPass, segIndexMono; + Int segIndexPass, segIndexMono = 0; findBotLeftSegment(leftChain, leftEnd, leftCorner, grid->get_u_value(leftU), segIndexMono, segIndexPass); sampleBotLeftWithGridLinePost(botVertex, |