~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
205
205
        return nearestPoint;
206
206
}
207
207
 
208
 
int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 
208
int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint, bool isPredictive)
209
209
{
210
 
        btAssert(validContactDistance(newPoint));
211
 
 
 
210
        if (!isPredictive)
 
211
        {
 
212
                btAssert(validContactDistance(newPoint));
 
213
        }
 
214
        
212
215
        int insertIndex = getNumContacts();
213
216
        if (insertIndex == MANIFOLD_CACHE_SIZE)
214
217
        {
287
290
                        {
288
291
                                //contact point processed callback
289
292
                                if (gContactProcessedCallback)
290
 
                                        (*gContactProcessedCallback)(manifoldPoint,m_body0,m_body1);
 
293
                                        (*gContactProcessedCallback)(manifoldPoint,(void*)m_body0,(void*)m_body1);
291
294
                        }
292
295
                }
293
296
        }