Merging r51923 through r52851 from trunk into soc-2011-tomato

2012-12-10 15:18:00 +00:00
parent da24aa8d10
commit b1afaa8312
978 changed files with 32475 additions and 17107 deletions
--- a/source/gameengine/Expressions/IntValue.cpp
+++ b/source/gameengine/Expressions/IntValue.cpp
@@ -286,7 +286,7 @@ cInt CIntValue::GetInt()

 double CIntValue::GetNumber()
 {
-	return (float) m_int;
+	return (double) m_int;
 }


@@ -323,9 +323,6 @@ void CIntValue::SetValue(CValue* newval)
 #ifdef WITH_PYTHON
 PyObject *CIntValue::ConvertValueToPython()
 {
-	if ((m_int > INT_MIN) && (m_int < INT_MAX))
-		return PyLong_FromSsize_t(m_int);
-	else
-		return PyLong_FromLongLong(m_int);
+	return PyLong_FromLongLong(m_int);
 }
 #endif // WITH_PYTHON