svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22875:22935
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Sep 2009 18:49:33 +0000 (18:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Sep 2009 18:49:33 +0000 (18:49 +0000)
Note, missing r22897, schlaile
source/blender/src/hddaudio.c

1  2 
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_Polygon.h

@@@ -132,19 -140,19 +132,19 @@@ PyObject* KX_PolyProxy::py_getattro(PyO
        }
        if (!strcmp(attr_str, "v1"))
        {
-               return PyLong_FromSsize_t(m_polygon->GetVertexOffset(0));
 -              return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, 0));
++              return PyLong_FromSsize_t(m_polygon->GetVertexOffsetAbs(m_mesh, 0));
        }
        if (!strcmp(attr_str, "v2"))
        {
-               return PyLong_FromSsize_t(m_polygon->GetVertexOffset(1));
 -              return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, 1));
++              return PyLong_FromSsize_t(m_polygon->GetVertexOffsetAbs(m_mesh, 1));
        }
        if (!strcmp(attr_str, "v3"))
        {
-               return PyLong_FromSsize_t(m_polygon->GetVertexOffset(2));
 -              return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, 2));
++              return PyLong_FromSsize_t(m_polygon->GetVertexOffsetAbs(m_mesh, 2));
        }
        if (!strcmp(attr_str, "v4"))
        {
-               return PyLong_FromSsize_t(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffset(3):0));
 -              return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffsetAbs(m_mesh, 3):0));
++              return PyLong_FromSsize_t(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffsetAbs(m_mesh, 3):0));
        }
        if (!strcmp(attr_str, "visible"))
        {
@@@ -244,9 -255,9 +244,9 @@@ KX_PYMETHODDEF_DOC(KX_PolyProxy, getVer
        }
        if (index < m_polygon->VertexCount())
        {
-               return PyLong_FromSsize_t(m_polygon->GetVertexOffset(index));
 -              return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, index));
++              return PyLong_FromSsize_t(m_polygon->GetVertexOffsetAbs(m_mesh, index));
        }
 -      return PyInt_FromLong(0);
 +      return PyLong_FromSsize_t(0);
  }
  
  KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getMesh,