diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
| commit | 9424b1ceff992f420fe6315acabfb7138cd0026e (patch) | |
| tree | 2f19cac8af2ad32852cf9c46cb542e14fabe8d9b /source/gameengine/Converter/BL_DeformableGameObject.h | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
| parent | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (diff) | |
Merging pepper to trunk at revision 39791.
Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
Diffstat (limited to 'source/gameengine/Converter/BL_DeformableGameObject.h')
| -rw-r--r-- | source/gameengine/Converter/BL_DeformableGameObject.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h index 615bb84ac2b..3ba55664007 100644 --- a/source/gameengine/Converter/BL_DeformableGameObject.h +++ b/source/gameengine/Converter/BL_DeformableGameObject.h @@ -82,23 +82,6 @@ public: bool SetActiveAction(class BL_ShapeActionActuator *act, short priority, double curtime); bool GetShape(vector<float> &shape); - Key* GetKey() - { - if(m_pDeformer) { - BL_MeshDeformer *deformer= dynamic_cast<BL_MeshDeformer *>(m_pDeformer); // incase its not a MeshDeformer - if(deformer) { - return deformer->GetMesh()->key; - } - -#if 0 // TODO. shape keys for softbody, currently they dont store a mesh. - KX_SoftBodyDeformer *deformer_soft= dynamic_cast<KX_SoftBodyDeformer *>(m_pDeformer); - if(deformer) { - return deformer->GetMesh()->key; - } -#endif - } - return NULL; - } virtual void SetDeformer(class RAS_Deformer* deformer); virtual class RAS_Deformer* GetDeformer() |