Rico Schüller : d3dx9: Allow setting texture to NULL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7b902d227847a77c64a6a6fe12d2e772f2f67e0e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7b902d227847a77c64a6a6fe12...

Author: Rico Schüller 
Date:   Tue Nov 15 15:35:35 2011 +0100

d3dx9: Allow setting texture to NULL.

---

dlls/d3dx9_36/effect.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index a042ea6..661721d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2146,7 +2146,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3D

TRACE("iface %p, parameter %p, texture %p\n", This, parameter, texture);

-    if (texture && param && !param->element_count &&
+    if (param && !param->element_count &&
             (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D
             || param->type == D3DXPT_TEXTURE2D || param->type ==  D3DXPT_TEXTURE3D
             || param->type == D3DXPT_TEXTURECUBE))