diff options
| author | Kamil Zbróg | 2013-11-26 18:53:03 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-26 18:53:03 +0000 |
| commit | 15bb1c61eda48f09253ccb8d2a42ccad59f3b00a (patch) | |
| tree | c2f5ac2907225730c6f1cdaa000f549ef7951183 /backends/graphics/opengl | |
| parent | 446c57d281e592653c9935c896d33334d23f0519 (diff) | |
| parent | e1afc7d0d777dad4b7ca0a58f0bb0324b24f9584 (diff) | |
| download | scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.tar.gz scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.tar.bz2 scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Conflicts:
engines/configure.engines
engines/engines.mk
engines/plugins_table.h
Diffstat (limited to 'backends/graphics/opengl')
| -rw-r--r-- | backends/graphics/opengl/texture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/graphics/opengl/texture.cpp b/backends/graphics/opengl/texture.cpp index 917bf70534..8f17ed7eeb 100644 --- a/backends/graphics/opengl/texture.cpp +++ b/backends/graphics/opengl/texture.cpp @@ -287,7 +287,7 @@ void TextureCLUT8::allocate(uint width, uint height) { // We only need to reinitialize our CLUT8 surface when the output size // changed. - if (width == _clut8Data.w && width == _clut8Data.h) { + if (width == _clut8Data.w && height == _clut8Data.h) { return; } |