Revision: 16579
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16579
Author: erwin
Date: 2008-09-17 21:47:26 +0200 (Wed, 17 Sep 2008)
Log Message:
-----------
Please add extern/bullet2/src/LinearMath/btConvexHull.cpp to your build system!
Reverted back to original Bullet version.
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 19:29:44 UTC (rev 16578)
+++ trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
2008-09-17 19:47:26 UTC (rev 16579)
@@ -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);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
