diff options
| author | Lukas Steiblys <imbusy@imbusy.org> | 2009-10-02 02:29:15 +0400 |
|---|---|---|
| committer | Lukas Steiblys <imbusy@imbusy.org> | 2009-10-02 02:29:15 +0400 |
| commit | 0677398a649b6b8c293df3ce3c6668f0a3be3bc8 (patch) | |
| tree | 9d510a5bd23559bf4fae670ed04d7e5d6c12578c /source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp | |
| parent | 59248e9f62006ba05e3098e4d213f3dcb23fe711 (diff) | |
| parent | bc942eceacb638735dc4f4f68252c4c207147a70 (diff) | |
merge from 23153 to 23595soc-2009-imbusy
Diffstat (limited to 'source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp index e85b8a32798..967bbfcdf1d 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp @@ -44,6 +44,8 @@ #include <config.h> #endif +#ifndef DISABLE_PYTHON + /* ------------------------------------------------------------------------- */ /* Python functions */ /* ------------------------------------------------------------------------- */ @@ -112,6 +114,8 @@ KX_PYMETHODDEF_DOC(KX_SCA_ReplaceMeshActuator, instantReplaceMesh, Py_RETURN_NONE; } +#endif // DISABLE_PYTHON + /* ------------------------------------------------------------------------- */ /* Native functions */ /* ------------------------------------------------------------------------- */ @@ -122,7 +126,7 @@ KX_SCA_ReplaceMeshActuator::KX_SCA_ReplaceMeshActuator(SCA_IObject *gameobj, bool use_gfx, bool use_phys) : - SCA_IActuator(gameobj), + SCA_IActuator(gameobj, KX_ACT_REPLACE_MESH), m_mesh(mesh), m_scene(scene), m_use_gfx(use_gfx), |