From 57436f3013998ffff24625d5c8bf96e865fbe022 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 3 Mar 2011 08:01:11 +0000 Subject: [PATCH] fix for own error made r35267. --- source/blender/python/generic/mathutils.c | 8 ++++---- source/gameengine/Ketsji/KX_GameObject.cpp | 4 ++-- source/gameengine/Ketsji/KX_ObjectActuator.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/blender/python/generic/mathutils.c b/source/blender/python/generic/mathutils.c index 3f888cbfdeb..9d2fcf1cbe5 100644 --- a/source/blender/python/generic/mathutils.c +++ b/source/blender/python/generic/mathutils.c @@ -278,7 +278,7 @@ int _BaseMathObject_ReadCallback(BaseMathObject *self) return 0; if(!PyErr_Occurred()) - PyErr_Format(PyExc_RuntimeError, "%s user has become invalid", Py_TYPE(self)->tp_name); + PyErr_Format(PyExc_RuntimeError, "%s read, user has become invalid", Py_TYPE(self)->tp_name); return -1; } @@ -289,7 +289,7 @@ int _BaseMathObject_WriteCallback(BaseMathObject *self) return 0; if(!PyErr_Occurred()) - PyErr_Format(PyExc_RuntimeError, "%s user has become invalid", Py_TYPE(self)->tp_name); + PyErr_Format(PyExc_RuntimeError, "%s write, user has become invalid", Py_TYPE(self)->tp_name); return -1; } @@ -300,7 +300,7 @@ int _BaseMathObject_ReadIndexCallback(BaseMathObject *self, int index) return 0; if(!PyErr_Occurred()) - PyErr_Format(PyExc_RuntimeError, "%s user has become invalid", Py_TYPE(self)->tp_name); + PyErr_Format(PyExc_RuntimeError, "%s read index, user has become invalid", Py_TYPE(self)->tp_name); return -1; } @@ -311,7 +311,7 @@ int _BaseMathObject_WriteIndexCallback(BaseMathObject *self, int index) return 0; if(!PyErr_Occurred()) - PyErr_Format(PyExc_RuntimeError, "%s user has become invalid", Py_TYPE(self)->tp_name); + PyErr_Format(PyExc_RuntimeError, "%s write index, user has become invalid", Py_TYPE(self)->tp_name); return -1; } diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index bd59949475a..85d09d9f5d5 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1368,7 +1368,7 @@ static int mathutils_kxgameob_vector_set(BaseMathObject *bmo, int subtype) static int mathutils_kxgameob_vector_get_index(BaseMathObject *bmo, int subtype, int index) { /* lazy, avoid repeteing the case statement */ - if(!mathutils_kxgameob_vector_get(bmo, subtype)) + if(mathutils_kxgameob_vector_get(bmo, subtype) == -1) return -1; return 0; } @@ -1378,7 +1378,7 @@ static int mathutils_kxgameob_vector_set_index(BaseMathObject *bmo, int subtype, float f= bmo->data[index]; /* lazy, avoid repeteing the case statement */ - if(!mathutils_kxgameob_vector_get(bmo, subtype)) + if(mathutils_kxgameob_vector_get(bmo, subtype) == -1) return -1; bmo->data[index]= f; diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 977e32a4c7f..8c3e25cf3e2 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -436,7 +436,7 @@ static int mathutils_obactu_vector_set(BaseMathObject *bmo, int subtype) static int mathutils_obactu_vector_get_index(BaseMathObject *bmo, int subtype, int index) { /* lazy, avoid repeteing the case statement */ - if(!mathutils_obactu_vector_get(bmo, subtype)) + if(mathutils_obactu_vector_get(bmo, subtype) == -1) return -1; return 0; } @@ -446,7 +446,7 @@ static int mathutils_obactu_vector_set_index(BaseMathObject *bmo, int subtype, i float f= bmo->data[index]; /* lazy, avoid repeteing the case statement */ - if(!mathutils_obactu_vector_get(bmo, subtype)) + if(mathutils_obactu_vector_get(bmo, subtype) == -1) return -1; bmo->data[index]= f;