Page MenuHome

Update bullet to version 2.80
Closed, ResolvedPublicPATCH

Description

This patch does the following:

Update blender's copy of bullet to version 2.80 (bullet svn revision: 2537)

Remove Jamfiles, they're not used

Add patches for local changes to the patches directory.

Update readme.txt, it had outdated information.

Event Timeline

With some of the new files added, remember to add a svn prop for line-endings set to 'native' :
http://aligorith.blogspot.co.nz/2010/12/svn-quick-tip-enable-autoprops.html

Have you checked on whether this still builds fine with scons? On the surface it looks fine, and probably should be if there wasn't major reshuffling or modules added/removed.

Compiling with scons worked but there were linking errors.
After spending way too much time trying to figure out what was going on I changed the SConscript to work similar to CMake.
Now it only builds one bullet library instead of splitting it into several.

Regarding line-endings, I re-added the new files using --auto-props, so hopefully it's fine now.

I've attached a second patch that should address both issues.

Hi Sergej,

I Checked out external at revision 678. Checked out revision 47350.

I built in a build-debug folder, switching the generated CMakeCache.txt mode from release to debug.
I'm on Ubuntu 12.04.

While applying the patch I got the following

...
patching file extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
Reversed (or previously applied) patch detected! Assume -R? [n]
I chose [y]
...
patching file extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
...

I got linking errors http://www.pasteall.org/32582 starting with

Linking CXX executable ../../bin/blender
../../lib/libextern_bullet.a(btPolyhedralConvexShape.cpp.o): In function `btConvexHullComputer::compute(float const*, int, int, float, float)':
/home/kesten/VCP/Bazaar/blender/patches-branch/blender/extern/bullet2/src/LinearMath/btConvexHullComputer.h:91: undefined reference to `btConvexHullComputer::compute(void const*, bool, int, int, float, float)'

I'll see if i can track down the problem later today, unless you can tell me what's wrong from this snippet.

kestion


There's been another change to bullet (and it's CMake files) in trunk after I've written this patch.
I'll look into it and attach a third patch in a couple of hours (I'm busy right now).

I've updated the patch so it applies cleanly against current trunk.

Sergej Reich (sergof) changed the task status from Unknown Status to Resolved.Jun 9 2012, 12:58 AM