diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-04 09:34:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-04 09:34:21 +0400 |
commit | 9bb8540ba9e716363ed654aeb989cf83ea704d4a (patch) | |
tree | 409f8794615e3087c9407da4882e7d7b3a8364d5 /source/gameengine/Ketsji/KX_GameObject.h | |
parent | 59bfe91f217dcb9c4a2ccb44422fe3f20566b751 (diff) | |
parent | 856dba000b09409bf6da2865bca2c79dba378683 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22130:22205
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index b235464259f..ba7451fdeef 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -98,8 +98,6 @@ protected: KX_IPhysicsController* m_pPhysicsController1; PHY_IGraphicController* m_pGraphicController; - // used for ray casting - PHY_IPhysicsEnvironment* m_pPhysicsEnvironment; STR_String m_testPropName; bool m_xray; KX_GameObject* m_pHitObject; @@ -337,20 +335,6 @@ public: bool ang_vel_local ); - - /** - * @return a pointer to the physics environment in use during the game, for rayCasting - */ - PHY_IPhysicsEnvironment* GetPhysicsEnvironment() - { - return m_pPhysicsEnvironment; - } - - void SetPhysicsEnvironment(PHY_IPhysicsEnvironment* physicsEnvironment) - { - m_pPhysicsEnvironment = physicsEnvironment; - } - /** * @return a pointer to the physics controller owned by this class. */ |