mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-14 22:00:05 +00:00
Merge remote-tracking branch 'bp/master'
This commit is contained in:
commit
1629801d95
@ -10864,6 +10864,9 @@ static struct PyModuleDef moduledef = {
|
||||
};
|
||||
#endif
|
||||
|
||||
#if __GNUC__ >= 4
|
||||
__attribute__((visibility ("default")))
|
||||
#endif
|
||||
PyMODINIT_FUNC
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
PyInit_pybullet(void)
|
||||
|
2
setup.py
2
setup.py
@ -370,6 +370,8 @@ if _platform == "linux" or _platform == "linux2":
|
||||
CXX_FLAGS += '-DDYNAMIC_LOAD_X11_FUNCTIONS '
|
||||
CXX_FLAGS += '-DHAS_SOCKLEN_T '
|
||||
CXX_FLAGS += '-fno-inline-functions-called-once '
|
||||
CXX_FLAGS += '-fvisibility=hidden '
|
||||
CXX_FLAGS += '-fvisibility-inlines-hidden '
|
||||
EGL_CXX_FLAGS += '-DBT_USE_EGL '
|
||||
EGL_CXX_FLAGS += '-fPIC ' # for plugins
|
||||
|
||||
|
@ -736,6 +736,7 @@ void btMultiBodyDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
|
||||
m_scratch_v.resize(bod->getNumLinks() + 1);
|
||||
m_scratch_m.resize(bod->getNumLinks() + 1);
|
||||
|
||||
if (bod->internalNeedsJointFeedback())
|
||||
{
|
||||
if (!bod->isUsingRK4Integration())
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user