svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

2009-07-02 11:28:42 +00:00
parent 2acac0ff99
commit b14298f959
825 changed files with 14547 additions and 77617 deletions
@@ -330,7 +330,7 @@ void CIntValue::SetValue(CValue* newval)
 PyObject* CIntValue::ConvertValueToPython()
 {
 	if((m_int > INT_MIN) && (m_int < INT_MAX))
-		return PyInt_FromLong(m_int);
+		return PyLong_FromSsize_t(m_int);
 	else
 		return PyLong_FromLongLong(m_int);
 }