Merge default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-01-21 12:06:35 -04:00
104 changed files with 16 additions and 7 deletions
-4
View File
@@ -294,10 +294,6 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b
// Restore the graphics state.
restoreState(states.back());
pixelScaleStack.clear();
pixelScaleStack.reserve(5);
pixelScaleStack.push_back(1);
int gammacorrect = isGammaCorrect() ? 1 : 0;
// We always need a default shader.