Skip to content

Commit

Permalink
UPBGE: Allow convex hull shape reinstancing.
Browse files Browse the repository at this point in the history
  • Loading branch information
panzergame authored and youle31 committed May 26, 2019
1 parent 3129f59 commit 7d33328
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ base class --- :class:`SCA_IObject`

.. warning::

Only triangle mesh type objects are supported currently (not convex hull)
Only triangle mesh and convex hull type objects are supported currently.

.. warning::

Expand Down
2 changes: 1 addition & 1 deletion source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ bool CcdPhysicsController::IsPhysicsSuspended()
*/
bool CcdPhysicsController::ReinstancePhysicsShape(KX_GameObject *from_gameobj, RAS_Mesh *from_meshobj, bool dupli)
{
if (m_shapeInfo->m_shapeType != PHY_SHAPE_MESH) {
if (!ELEM(m_shapeInfo->m_shapeType, PHY_SHAPE_MESH, PHY_SHAPE_POLYTOPE)) {
return false;
}

Expand Down

0 comments on commit 7d33328

Please sign in to comment.