diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-09 15:44:48 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-09 16:44:12 +0300 |
| commit | 9044ccec5f811fd380fc0348d91d1c53729eea22 (patch) | |
| tree | ca49364eae2fba58bbc043ae9a72866e0f926588 /source/gameengine | |
| parent | 8bb7a339f76549b4820a670450c0799713d650f8 (diff) | |
Cleanup to shapekeys' make_local (and copy) functions.
Mostly pass bmain and do not check for NULL key, keys' make_local is
suspiciously simple in fact, but think until those behave like real
full-featured IDs, it's doing enough!
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_ShapeDeformer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp index 5e31dabfab1..ef9e9544c30 100644 --- a/source/gameengine/Converter/BL_ShapeDeformer.cpp +++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp @@ -75,7 +75,7 @@ BL_ShapeDeformer::BL_ShapeDeformer(BL_DeformableGameObject *gameobj, m_useShapeDrivers(false), m_lastShapeUpdate(-1) { - m_key = BKE_key_copy(m_bmesh->key); + m_key = m_bmesh->key ? BKE_key_copy(m_bmesh->key) : NULL; }; /* this second constructor is needed for making a mesh deformable on the fly. */ @@ -91,7 +91,7 @@ BL_ShapeDeformer::BL_ShapeDeformer(BL_DeformableGameObject *gameobj, m_useShapeDrivers(false), m_lastShapeUpdate(-1) { - m_key = BKE_key_copy(m_bmesh->key); + m_key = m_bmesh->key ? BKE_key_copy(m_bmesh->key) : NULL; }; BL_ShapeDeformer::~BL_ShapeDeformer() @@ -117,7 +117,7 @@ void BL_ShapeDeformer::ProcessReplica() BL_SkinDeformer::ProcessReplica(); m_lastShapeUpdate = -1; - m_key = BKE_key_copy(m_key); + m_key = m_key ? BKE_key_copy(m_key) : NULL; } bool BL_ShapeDeformer::LoadShapeDrivers(KX_GameObject* parent) |