From 5784b958237a435bd5fd0965eb9b940e654ada87 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Aug 2010 16:59:19 +0000 Subject: Fix #23167: halo "texture" option did not take disabling of the texture into account. --- source/blender/render/intern/source/texture.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source') diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 60565d0ff16..0e98069f884 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -2509,6 +2509,7 @@ void do_halo_tex(HaloRen *har, float xn, float yn, float *colf) if (R.r.scemode & R_NO_TEX) return; mtex= har->mat->mtex[0]; + if(har->mat->septex & (1<<0)) return; if(mtex->tex==NULL) return; /* no normal mapping */ -- cgit v1.2.3