[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31112] trunk/blender/source/blender/ render/intern/source/texture.c: Fix #23167: halo "texture" option did not take disabling of the texture

[Brecht Van Lommel]

Revision: 31112
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31112
Author:   blendix
Date:     2010-08-06 18:59:19 +0200 (Fri, 06 Aug 2010)

Log Message:
-----------
Fix #23167: halo "texture" option did not take disabling of the texture
into account.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2010-08-06 16:33:36 UTC (rev 31111)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2010-08-06 16:59:19 UTC (rev 31112)
@@ -2509,6 +2509,7 @@
 	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 */