[Bf-blender-cvs] [07a7d64] master: BGE: make error message more clear when trying to de/activate actuator from non-active controller
Dalai Felinto
noreply at git.blender.org
Tue Sep 15 05:02:06 CEST 2015
Commit: 07a7d64c06860204a02db6cd2897064cd7a07363
Author: Dalai Felinto
Date: Tue Sep 15 00:01:09 2015 -0300
Branches: master
https://developer.blender.org/rB07a7d64c06860204a02db6cd2897064cd7a07363
BGE: make error message more clear when trying to de/activate actuator from non-active controller
===================================================================
M source/gameengine/GameLogic/SCA_PythonController.cpp
===================================================================
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 0c7bc9f..fa30e3a 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;
}
More information about the Bf-blender-cvs
mailing list