diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-02 05:01:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-02 05:01:07 +0400 |
| commit | 15ad39e6848ea54da8a3f36b867f8b09a7b8b163 (patch) | |
| tree | 53e4f1c2f37d0e2f3679e284a8f7c0f3f66f6d5c /source/gameengine | |
| parent | ce6487291349b00a85f265d2b8cfb682e2bb8086 (diff) | |
| parent | 1936b31cd0f7741ec39f638cc57286e5b379134c (diff) | |
svn merge ^/trunk/blender -r42303:42329
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 56c0f46865a..f5787dad41e 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -896,7 +896,7 @@ void RAS_OpenGLRasterizer::IndexPrimitivesInternal(RAS_MeshSlot& ms, bool multi) //ms.m_pDerivedMesh->drawMappedFacesTex(ms.m_pDerivedMesh, CheckTexfaceDM, mcol); current_blmat_nr = current_polymat->GetMaterialIndex(); current_image = current_polymat->GetBlenderImage(); - ms.m_pDerivedMesh->drawFacesTex(ms.m_pDerivedMesh, CheckTexDM); + ms.m_pDerivedMesh->drawFacesTex(ms.m_pDerivedMesh, CheckTexDM, NULL, NULL); } return; } |