Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorMartin Felke <martin.felke@googlemail.com>2018-11-18 19:39:19 +0300
committerMartin Felke <martin.felke@googlemail.com>2018-11-18 19:39:19 +0300
commitbaabe028a4a7ce0040b6b94b934ad3f8db3594a0 (patch)
tree6a6a5b6f6df1306fb7cc2625650bd4c0929618b3 /extern
parent4729279fd5d279de5a7bbcaf6d92112a5102a591 (diff)
brought compound back + some recent fixes from 2.7 branch
Diffstat (limited to 'extern')
-rw-r--r--extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
index f17b338e477..a551feb9f66 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
@@ -221,6 +221,7 @@ void btFractureDynamicsWorld::glueCallback()
m_idCallback(body0->getUserPointer(),&objectId0, &shardId0);
m_idCallback(body1->getUserPointer(),&objectId1, &shardId1);
+ printf("%d %d %d %d\n", objectId0, objectId1, tag0, tag1);
//if (!colObj0->isStaticOrKinematicObject() && !colObj1->isStaticOrKinematicObject())
if (objectId0 == objectId1 && objectId0 > -1 && tag0 > -1 && tag1 > -1)
{