diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-11 10:35:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 10:35:09 +0100 |
| commit | dfb3634c3462adb3d9f0bf1e2e7b4261c3313b80 (patch) | |
| tree | 5686d27865e80aab6d60abc2e8e34fc2138a38a9 /modules/bullet/pin_joint_bullet.cpp | |
| parent | 237be766d4b0247d7ded0a9b85da12a989c561c8 (diff) | |
| parent | b546cd50a36a809ba8beb8da1126d41c3b19294b (diff) | |
Merge pull request #13836 from AndreaCatania/scale
Fixed bullet scale on get_transform and joints
Diffstat (limited to 'modules/bullet/pin_joint_bullet.cpp')
| -rw-r--r-- | modules/bullet/pin_joint_bullet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/pin_joint_bullet.cpp b/modules/bullet/pin_joint_bullet.cpp index 8c74fcbc94..665e825967 100644 --- a/modules/bullet/pin_joint_bullet.cpp +++ b/modules/bullet/pin_joint_bullet.cpp @@ -40,8 +40,8 @@ PinJointBullet::PinJointBullet(RigidBodyBullet *p_body_a, const Vector3 &p_pos_a btVector3 btPivotA; btVector3 btPivotB; - G_TO_B(p_pos_a, btPivotA); - G_TO_B(p_pos_b, btPivotB); + G_TO_B(p_pos_a * p_body_a->get_body_scale(), btPivotA); + G_TO_B(p_pos_b * p_body_b->get_body_scale(), btPivotB); p2pConstraint = bulletnew(btPoint2PointConstraint(*p_body_a->get_bt_rigid_body(), *p_body_b->get_bt_rigid_body(), btPivotA, |