Fix compilation due to merge issue.

Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@808 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 0d86aa7b
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 807 #define BUILD_REVISION 808
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -2178,7 +2178,7 @@ void Context::applyTextures(SamplerType type) ...@@ -2178,7 +2178,7 @@ void Context::applyTextures(SamplerType type)
{ {
if (appliedTextureSerial[samplerIndex] != 0) if (appliedTextureSerial[samplerIndex] != 0)
{ {
device->SetTexture(samplerIndex + d3dSamplerOffset, NULL); mDevice->SetTexture(samplerIndex + d3dSamplerOffset, NULL);
appliedTextureSerial[samplerIndex] = 0; appliedTextureSerial[samplerIndex] = 0;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment