merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]
This commit is contained in:
Joseph Eagar
2009-10-22 23:22:05 +00:00
parent 36bb566d4e
commit 8f788c64db
1313 changed files with 104799 additions and 120780 deletions

View File

@@ -35,6 +35,8 @@
// needed for IsTriggered()
#include "SCA_PythonController.h"
#include <stdio.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -288,6 +290,9 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr)
}
}
}
#ifndef DISABLE_PYTHON
/* ----------------------------------------------- */
/* Python Functions */
/* ----------------------------------------------- */
@@ -379,5 +384,6 @@ int SCA_ISensor::pyattr_check_tap(void *self_v, const KX_PYATTRIBUTE_DEF *attrde
self->m_level = false;
return 0;
}
#endif // DISABLE_PYTHON
/* eof */