From 1cb336577127262af9d3d6941c7b26bcbad08609 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Thu, 22 Jul 2010 00:19:43 +0000
Subject: [PATCH] revert change in bFile, it broke serialization

---
 Extras/Serialize/BulletFileLoader/bFile.cpp | 29 ++++-----------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/Extras/Serialize/BulletFileLoader/bFile.cpp b/Extras/Serialize/BulletFileLoader/bFile.cpp
index 3531dd59c..849c98f31 100644
--- a/Extras/Serialize/BulletFileLoader/bFile.cpp
+++ b/Extras/Serialize/BulletFileLoader/bFile.cpp
@@ -183,8 +183,7 @@ void bFile::parseInternal(bool verboseDumpAllTypes, char* memDna,int memDnaLengt
 		return;
 
 	char *blenderData = mFileBuffer;
-	bChunkInd dna;
-	dna.oldPtr = 0;
+	int sdnaPos=0;
 
 	char *tempBuffer = blenderData;
 	for (int i=0; i<mFileLen; i++)
@@ -194,33 +193,15 @@ void bFile::parseInternal(bool verboseDumpAllTypes, char* memDna,int memDnaLengt
 
 		if (!mDataStart && strncmp(tempBuffer, "REND", 4)==0)
 			mDataStart = i;
+		if (!sdnaPos && strncmp(tempBuffer, "SDNANAME", 8)==0)
+			sdnaPos = i;
 
-		if (strncmp(tempBuffer, "DNA1", 4)==0)
-		{
-			// read the DNA1 block and extract SDNA
-			if (getNextBlock(&dna, tempBuffer, mFlags) > 0)
-			{
-				if (strncmp((tempBuffer + ChunkUtils::getOffset(mFlags)), "SDNANAME", 8) ==0) 
-					dna.oldPtr = (tempBuffer + ChunkUtils::getOffset(mFlags));
-				else dna.oldPtr = 0;
-			}
-			else 
-				dna.oldPtr = 0;
-		}
-
-		if (mDataStart && dna.oldPtr) break;
+		if (mDataStart && sdnaPos) break;
 		tempBuffer++;
 	}
-	if (!dna.oldPtr || !dna.len)
-	{
-		printf("Failed to find DNA1+SDNA pair\n");
-		mFlags &= ~FD_OK;
-		return;
-	}
-
 
 	mFileDNA = new bDNA();
-	mFileDNA->init((char*)dna.oldPtr, dna.len, (mFlags & FD_ENDIAN_SWAP)!=0);
+	mFileDNA->init(blenderData+sdnaPos, mFileLen-sdnaPos, (mFlags & FD_ENDIAN_SWAP)!=0);
 
 	if (mVersion==276)
 	{