diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
| commit | 816377cc02fe5dd4be945c0f3d415861114b4980 (patch) | |
| tree | 306e9d1363aa66bc919e43b80b3380fab9f60ea9 /source/gameengine/Rasterizer/RAS_Polygon.cpp | |
| parent | c8af263e5d8d9d41a757e8438cdcf3b64d57e0c0 (diff) | |
| parent | ee768ada680ce0a8aa184c882005c0ef1c0140fb (diff) | |
Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas
The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_Polygon.cpp')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_Polygon.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp index 87c5118c5fb..eacc1285166 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.cpp +++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp @@ -31,7 +31,6 @@ #endif #include "RAS_Polygon.h" -#include "RAS_MeshObject.h" /* only for GetVertexOffsetAbs */ RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket, RAS_DisplayArray *darray, int numvert) { @@ -64,20 +63,6 @@ int RAS_Polygon::GetVertexOffset(int i) return m_offset[i]; } -int RAS_Polygon::GetVertexOffsetAbs(RAS_MeshObject *mesh, int i) -{ - /* hack that only works because there can only ever be 2 different - * GetDisplayArray's per mesh. if this uses a different display array to the first - * then its incices are offset. - * if support for edges is added back this would need to be changed. */ - RAS_DisplayArray* darray= mesh->GetPolygon(0)->GetDisplayArray(); - - if(m_darray != darray) - return m_offset[i] + darray->m_vertex.size(); - - return m_offset[i]; -} - /* int RAS_Polygon::GetEdgeCode() { |