diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-09-17 15:23:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-09-17 15:23:28 +0400 |
| commit | bbdcd3a0828bf1e17d5e2ff9cf1a3b9c45c9d213 (patch) | |
| tree | 1777104aadcc84f7d0eee87b645fd44d5e04fd8b /extern | |
| parent | f0e0e6b1c92b8fdcb1fd2828ee9f9da0048f8ff0 (diff) | |
rev 16569 broke building.
Looks like bullets Extras/ConvexDecomposition is missing from blenders source.
comment functions so it builds for now.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp index d9919967233..900ab85497d 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp +++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp @@ -278,7 +278,7 @@ void btSoftBodyHelpers::Draw( btSoftBody* psb, 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 @@ void btSoftBodyHelpers::Draw( btSoftBody* psb, hres.m_OutputVertices[idx[2]], color,1); } - hlib.ReleaseResult(hres); + //hlib.ReleaseResult(hres); } /* Velocities */ #if 0 @@ -634,7 +634,7 @@ btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldI 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 @@ btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldI 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); } |