From 9044ccec5f811fd380fc0348d91d1c53729eea22 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 9 Jul 2016 14:44:48 +0200 Subject: 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! --- source/gameengine/Converter/BL_ShapeDeformer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/gameengine') 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) -- cgit v1.2.3