Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (modified) (3 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h

@@ -1 +1 @@
 /*
 Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
 
 This software is provided 'as-is', without any express or implied warranty.
@@ -13 +13 @@
 3. This notice may not be removed or altered from any source distribution.
 */
+
+///Contains contributions from Disney Studio's
 
 #ifndef OPTIMIZED_BVH_H
@@ -46 +48 @@
 
         /// Data buffer MUST be 16 byte aligned
-        virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian)
+        virtual bool serializeInPlace(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) const
         {
                 return btQuantizedBvh::serialize(o_alignedDataBuffer,i_dataBufferSize,i_swapEndian);