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:
authorCampbell Barton <ideasman42@gmail.com>2009-06-04 11:42:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-06-04 11:42:03 +0400
commitcf6ed235784c6b5658fe53a2e52199ac87263b5c (patch)
tree7387d59ed1613be0cecdaf503b632ade48c0e9de /source/gameengine
parent06fe5deaecc0dff672fd778175fbf4127ae04785 (diff)
BGE small fixes
- script template use new property syntax - Python could set the axis/hat to a negative index and crash blender (nobody complained) - Servo control UI had overlapping text
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GameLogic/SCA_JoystickSensor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 16061d6fb6e..336529667d7 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -392,6 +392,8 @@ PyObject* SCA_JoystickSensor::PySetAxis( PyObject* args ) {
}
m_axis = axis;
m_axisf = axisflag;
+
+ CheckAxis((void *)this, NULL); /* clamp values */
Py_RETURN_NONE;
}
@@ -533,6 +535,8 @@ PyObject* SCA_JoystickSensor::PySetHat( PyObject* args ) {
}
m_hat = hat;
m_hatf = hatflag;
+
+ CheckHat((void *)this, NULL); /* clamp values */
Py_RETURN_NONE;
}