[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34904] trunk/blender/source/blender/ render/intern/source/renderdatabase.c: Bugfix #26103

[Ton Roosendaal]

Revision: 34904
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34904
Author:   ton
Date:     2011-02-16 12:34:08 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
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...

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

Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c	2011-02-16 12:00:53 UTC (rev 34903)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c	2011-02-16 12:34:08 UTC (rev 34904)
@@ -1000,6 +1000,7 @@
 	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];