diff options
author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-07-24 21:28:39 +0300 |
---|---|---|
committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-07-25 10:43:06 +0300 |
commit | 9939c189001566e1cfdbb09ecffdec177920b31a (patch) | |
tree | 6251a2acf318ace7329b937492a85e90bffcabfb /source/gameengine/Ketsji/KX_ClientObjectInfo.h | |
parent | e301cf3ec2cb8caa544032238cf7a1e7bb5e2523 (diff) |
BGE: Fix T35288 Touch/Ray/Mouse sensor and Constraint actuator with material check doesn't work.
Now we look at all materials instead of the first. So m_auxilary_info is useless and removed.
Diffstat (limited to 'source/gameengine/Ketsji/KX_ClientObjectInfo.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_ClientObjectInfo.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KX_ClientObjectInfo.h b/source/gameengine/Ketsji/KX_ClientObjectInfo.h index e947eb4be6d..81ae5b58009 100644 --- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h +++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h @@ -52,19 +52,16 @@ struct KX_ClientObjectInfo OBACTORSENSOR } m_type; KX_GameObject* m_gameobject; - void* m_auxilary_info; std::list<SCA_ISensor*> m_sensors; public: - KX_ClientObjectInfo(KX_GameObject *gameobject, clienttype type = STATIC, void *auxilary_info = NULL) : + KX_ClientObjectInfo(KX_GameObject *gameobject, clienttype type = STATIC) : m_type(type), - m_gameobject(gameobject), - m_auxilary_info(auxilary_info) + m_gameobject(gameobject) {} KX_ClientObjectInfo(const KX_ClientObjectInfo ©) : m_type(copy.m_type), - m_gameobject(copy.m_gameobject), - m_auxilary_info(copy.m_auxilary_info) + m_gameobject(copy.m_gameobject) { } |