Fix #23167: halo "texture" option did not take disabling of the texture

into account.
2010-08-06 16:59:19 +00:00
parent 6405342d9e
commit 5784b95823
1 changed files with 1 additions and 0 deletions
--- 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 */