From 7b902d227847a77c64a6a6fe12d2e772f2f67e0e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rico=20Sch=C3=BCller?= Date: Tue, 15 Nov 2011 15:35:35 +0100 Subject: [PATCH] d3dx9: Allow setting texture to NULL. --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a042ea677bb..661721dd133 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)) -- 2.11.4.GIT