From 6b12fa8fed341b7c14dbfb98c1895b7093cab0b7 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 16 Feb 2011 12:34:08 +0000 Subject: Bugfix #26103 Halo texture: disabling texture slot with [] button didn't work. Note: halos only allow 1 texture slot, UI allows to add more. This rna template stuff for texture slots I rather don't touch though... --- source/blender/render/intern/source/renderdatabase.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 036fb85e728..f5e5c679b9d 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -1000,6 +1000,7 @@ HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma, float *vec, f if(ma->mtex[0]) { if( (ma->mode & MA_HALOTEX) ) har->tex= 1; + else if(har->mat->septex & (1<<0)); /* only 1 level textures */ else { mtex= ma->mtex[0]; -- cgit v1.2.3