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:
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchSensor.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_TouchSensor.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 9baa9377f02..9091a41d054 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -369,15 +369,7 @@ PyObject* KX_TouchSensor::PyGetTouchMaterial(PyObject* self,
PyObject* args,
PyObject* kwds)
{
- int retval = 0;
-
- if (m_bFindMaterial) {
- retval = KX_TRUE;
- } else {
- retval = KX_FALSE;
- }
-
- return PyInt_FromLong(retval);
+ return PyInt_FromLong(m_bFindMaterial);
}
/* 6. setTouchMaterial */
@@ -394,13 +386,7 @@ PyObject* KX_TouchSensor::PySetTouchMaterial(PyObject* self, PyObject* args, PyO
return NULL;
}
- if (pulseArg == KX_TRUE) {
- m_bFindMaterial = true;
- } else if (pulseArg == KX_FALSE){
- m_bFindMaterial = false;
- } else {
- ; /* internal error */
- }
+ m_bFindMaterial = pulseArg != 0;
Py_Return;
}