revert old change to bullet.pc.in file for autotools. Note that autotools builds/installs lowercase libraries and cmake uses upper/camel case.
fix minor Blender serialization issue (not applicable to .bullet files, but code base is shared)
This commit is contained in:
@@ -830,6 +830,7 @@ void bFile::resolvePointersMismatch()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (i=0; i<m_pointerPtrFixupArray.size(); i++)
|
||||
{
|
||||
char* cur= m_pointerPtrFixupArray.at(i);
|
||||
@@ -843,20 +844,19 @@ void bFile::resolvePointersMismatch()
|
||||
|
||||
|
||||
int blockLen = block->len / ptrFile;
|
||||
int blkAlloc = blockLen * ptrMem;
|
||||
|
||||
void *onptr = findLibPointer(*ptrptr);
|
||||
if (onptr)
|
||||
{
|
||||
char *newPtr = new char[blkAlloc * ptrMem];
|
||||
char *newPtr = new char[blockLen * ptrMem];
|
||||
addDataBlock(newPtr);
|
||||
memset(newPtr, 0, blkAlloc * ptrMem);
|
||||
memset(newPtr, 0, blockLen * ptrMem);
|
||||
|
||||
void **onarray = (void**)onptr;
|
||||
char *oldPtr = (char*)onarray;
|
||||
|
||||
int p = 0;
|
||||
while (blkAlloc-- > 0)
|
||||
while (blockLen-- > 0)
|
||||
{
|
||||
btPointerUid dp = {0};
|
||||
safeSwapPtr((char*)dp.m_uniqueIds, oldPtr);
|
||||
@@ -1352,4 +1352,3 @@ int bFile::getNextBlock(bChunkInd *dataChunk, const char *dataPtr, const int fl
|
||||
|
||||
|
||||
//eof
|
||||
|
||||
|
||||
@@ -7,5 +7,5 @@ Name: bullet
|
||||
Description: Bullet Continuous Collision Detection and Physics Library
|
||||
Requires:
|
||||
Version: @PACKAGE_VERSION@
|
||||
Libs: -L${libdir} -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath
|
||||
Libs: -L${libdir} -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath
|
||||
Cflags: -I${includedir}/bullet
|
||||
|
||||
Reference in New Issue
Block a user