svn merge -r 16667:16741 https://svn.blender.org/svnroot/bf-blender/trunk/blender

1 files changed, 13 insertions, 1 deletions

diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index 315ad18c42c..126a1fcb1e7 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -83,9 +83,21 @@ public:
 		return (m_pDeformer) ? ((BL_MeshDeformer*)m_pDeformer)->GetMesh()->key : NULL;
 	}
 	
+	virtual void	SetDeformer(class RAS_Deformer* deformer)
+	{
+		m_pDeformer = deformer;
+	}
+	virtual class RAS_Deformer* GetDeformer()
+	{
+		return m_pDeformer;
+	}
+
 public:
-	RAS_Deformer		*m_pDeformer;	
+	
 protected:	
+	
+	RAS_Deformer		*m_pDeformer;
+
 	class BL_ShapeActionActuator *m_activeAct;
 	double		m_lastframe;
 	Object*		m_blendobj;