-
-
Notifications
You must be signed in to change notification settings - Fork 21.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bullet: Sync with upstream 3.17 #48299
Conversation
5920551
to
759e736
Compare
@@ -187,6 +187,7 @@ if env["builtin_bullet"]: | |||
"LinearMath/btGeometryUtil.cpp", | |||
"LinearMath/btPolarDecomposition.cpp", | |||
"LinearMath/btQuickprof.cpp", | |||
"LinearMath/btReducedVector.cpp", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pouleyKetchoupp It seems like you had omitted this .cpp
file when updating to 2.90/master a while ago: 3e7db60.
It built and seemed to work fine without it so maybe it's not needed, it seems to be used in:
BulletSoftBody/btDeformableContactProjection.cpp
190: btReducedVector p(x.size());
But in the #else
of an #ifndef USE_MGS
(i.e. only used if we pass USE_MGS
).
I'm adding it for consistency's sake, it should be optimized out by the linker if we don't actually need it I suppose. There's probably a lot of Bullet components which we wouldn't need to build if we don't use them directly, but not sure how easy that would be to identify to slim down our SCsub
.
Marking as draft for now as the And I just remembered that bullet is disabled on |
Synced with 3.17 which was released recently: https://github.com/bulletphysics/bullet3/releases/tag/3.17 |
Now that #48300 is merged, it would be great to update this PR with the same changes in order to keep master in sync, even if Bullet is disabled for now. |
Stop include Bullet headers using `-isystem` for GCC/Clang as it misleads SCons into not properly rebuilding all files when headers change. This means we also need to make sure Bullet builds without warning, and current version fares fairly well, there were just a couple to fix (patch included). Increase minimum version for distro packages to 2.90 (this was never released as the "next" version after 2.89 was 3.05... but that covers it too). Fixes godotengine#43868. (cherry picked from commit b7901c7)
(cherry picked from commit 6f81c21)
2677169
to
b55fd93
Compare
Includes bulletphysics/bullet3#3799.
Fixes #43868.
The duplicated comments in bullet code are a partial revert of #48187 since I synced with the unchanged
3.17
upstream code. They should be removed upstream if they matter.Note: The bullet module in the
master
branch doesn't actually build currently. This PR just serves to keep the code in sync with the3.x
branch for future use.