← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
98
98
 
99
99
                int find(int x)
100
100
                { 
101
 
                        //assert(x < m_N);
102
 
                        //assert(x >= 0);
 
101
                        //btAssert(x < m_N);
 
102
                        //btAssert(x >= 0);
103
103
 
104
104
                        while (x != m_elements[x].m_id) 
105
105
                        {
110
110
                                m_elements[x].m_id = m_elements[m_elements[x].m_id].m_id;
111
111
                #endif //
112
112
                                x = m_elements[x].m_id;
113
 
                                //assert(x < m_N);
114
 
                                //assert(x >= 0);
 
113
                                //btAssert(x < m_N);
 
114
                                //btAssert(x >= 0);
115
115
 
116
116
                        }
117
117
                        return x;