summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2013-11-13 16:17:42 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2013-11-13 16:17:42 -0600
commit2a23bdde6f76c0bff0906bbbee298480b52ba0c2 (patch)
tree22a7bccfb1cb25d4c9f247ca3d43904a4a6d79dc /Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
parent3c7613fc83981f9ef8efa2e4ac478af9fe23bdec (diff)
parent63a9dff3bb8c88cdc5b941db1f3813843c7a8564 (diff)
Merge branch 'master' into android-new-control-input-overlay
Conflicts: Source/Core/DolphinWX/Src/Android/ButtonManager.h
Diffstat (limited to 'Source/Core/VideoBackends/Software/Src/SetupUnit.cpp')
-rw-r--r--Source/Core/VideoBackends/Software/Src/SetupUnit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/Software/Src/SetupUnit.cpp b/Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
index f0cc179f25..b08584e0a9 100644
--- a/Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
+++ b/Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
@@ -99,7 +99,7 @@ void SetupUnit::SetupTriStrip()
m_VertPointer[2 - (m_VertexCounter & 1)] = m_VertPointer[0];
m_VertWritePointer = m_VertPointer[0];
- m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];
+ m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];
}
void SetupUnit::SetupTriFan()