[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16573] trunk/blender/extern/bullet2/src/ BulletSoftBody/btSoftBodyHelpers.cpp: rev 16569 broke building.

Campbell Barton ideasman42 at gmail.com
Wed Sep 17 13:23:28 CEST 2008


Revision: 16573
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16573
Author:   campbellbarton
Date:     2008-09-17 13:23:28 +0200 (Wed, 17 Sep 2008)

Log Message:
-----------
rev 16569 broke building.
Looks like bullets Extras/ConvexDecomposition is missing from blenders source.
comment functions so it builds for now.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16569

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp

Modified: trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp	2008-09-17 04:07:58 UTC (rev 16572)
+++ trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp	2008-09-17 11:23:28 UTC (rev 16573)
@@ -278,7 +278,7 @@
 				HullResult		hres;
 				HullLibrary		hlib;
 				hdsc.mMaxVertices=vertices.size();
-				hlib.CreateConvexHull(hdsc,hres);
+				//hlib.CreateConvexHull(hdsc,hres);
 				const btVector3	center=average(hres.m_OutputVertices);
 				add(hres.m_OutputVertices,-center);
 				mul(hres.m_OutputVertices,(btScalar)1);
@@ -291,7 +291,7 @@
 										hres.m_OutputVertices[idx[2]],
 										color,1);
 					}
-				hlib.ReleaseResult(hres);
+				//hlib.ReleaseResult(hres);
 				}
 			/* Velocities	*/ 
 			#if 0
@@ -634,7 +634,7 @@
 	HullResult		hres;
 	HullLibrary		hlib;/*??*/ 
 	hdsc.mMaxVertices=nvertices;
-	hlib.CreateConvexHull(hdsc,hres);
+	//hlib.CreateConvexHull(hdsc,hres);
 	btSoftBody*		psb=new btSoftBody(&worldInfo,(int)hres.mNumOutputVertices,
 		&hres.m_OutputVertices[0],0);
 	for(int i=0;i<(int)hres.mNumFaces;++i)
@@ -647,7 +647,7 @@
 		if(idx[2]<idx[0]) psb->appendLink(	idx[2],idx[0]);
 		psb->appendFace(idx[0],idx[1],idx[2]);
 	}
-	hlib.ReleaseResult(hres);
+	//hlib.ReleaseResult(hres);
 	psb->randomizeConstraints();
 	return(psb);
 }





More information about the Bf-blender-cvs mailing list