Merge remote-tracking branch 'origin/master' into Font-Update

Former-commit-id: c62f6317f401e200eff303fcf5b8945302fd89c6
This commit is contained in:
Lynix
2015-01-03 22:21:14 +01:00
12 changed files with 372 additions and 48 deletions

View File

@@ -46,8 +46,8 @@ bool NzTriangleIterator::Advance()
case nzPrimitiveMode_TriangleStrip:
m_triangleIndices[2] = m_indexMapper.Get(m_currentIndex++);
m_triangleIndices[1] = m_triangleIndices[2];
m_triangleIndices[0] = m_triangleIndices[1];
m_triangleIndices[1] = m_triangleIndices[2];
break;
default: