Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2015-09-15 06:01:09 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-09-15 06:01:32 +0300
commit07a7d64c06860204a02db6cd2897064cd7a07363 (patch)
tree839ddcbd3bbad11e0c9045c54f5a059ab0f3da2d
parentdbe18291836163fa163a6980d13536de949cb152 (diff)
BGE: make error message more clear when trying to de/activate actuator from non-active controller
-rw-r--r--source/gameengine/GameLogic/SCA_PythonController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 0c7bc9fa93e..fa30e3a5caf 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -470,7 +470,7 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
PyObject *SCA_PythonController::PyActivate(PyObject *value)
{
if (m_sCurrentController != this) {
- PyErr_SetString(PyExc_SystemError, "Cannot add an actuator from a non-active controller");
+ PyErr_SetString(PyExc_SystemError, "Cannot activate an actuator from a non-active controller");
return NULL;
}
@@ -485,7 +485,7 @@ PyObject *SCA_PythonController::PyActivate(PyObject *value)
PyObject *SCA_PythonController::PyDeActivate(PyObject *value)
{
if (m_sCurrentController != this) {
- PyErr_SetString(PyExc_SystemError, "Cannot add an actuator from a non-active controller");
+ PyErr_SetString(PyExc_SystemError, "Cannot deactivate an actuator from a non-active controller");
return NULL;
}