← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mesa/lucid

« back to all changes in this revision

Viewing changes to src/glu/sgi/libnurbs/internals/subdivider.cc

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Timo Aaltonen, Robert Hooker
  • Date: 2010-02-19 15:52:12 UTC
  • mfrom: (3.1.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20100219155212-blqov938av7m6exj
Tags: 7.7-3ubuntu1
https://launchpad.net/bugs/522048
[ Timo Aaltonen ]
* Merge from Debian experimental.

[ Robert Hooker ]
* Add 100_no_abi_tag.patch: Removes the ABI tag in /usr/lib/libGL.so.1
  which prevented ldconfig from using a libGL from another directory
  at a higher priority than the one in /usr/lib.
* Install libGL alternatives with libgl1-mesa-swx11 as well. (LP: #522048)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glu/sgi/libnurbs/internals/subdivider.cc
531
531
                     patchlist.pspec[param].range[1] ) * 0.5;
532
532
        split( source, left, right, param, mid );
533
533
        Patchlist subpatchlist( patchlist, param, mid );
534
 
        if( left.isnonempty() )
 
534
        if( left.isnonempty() ) {
535
535
            if( subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT ) 
536
536
                freejarcs( left );
537
537
            else
538
538
                nonSamplingSplit( left, subpatchlist, subdivisions-1, param );
539
 
        if( right.isnonempty() ) 
 
539
        }
 
540
        if( right.isnonempty() ) {
540
541
            if( patchlist.cullCheck() == CULL_TRIVIAL_REJECT ) 
541
542
                freejarcs( right );
542
543
            else
543
544
                nonSamplingSplit( right, patchlist, subdivisions-1, param );
 
545
        }
544
546
 
545
547
    } else {
546
548
        // make bbox calls