diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-16 15:34:08 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-16 15:34:08 +0300 |
| commit | 6b12fa8fed341b7c14dbfb98c1895b7093cab0b7 (patch) | |
| tree | 4886c04c714e136485015b5c11f8fbc16fdc3070 | |
| parent | 1c32356b4f7839ef7f7ccace8e0c613d34c92ab5 (diff) | |
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...
| -rw-r--r-- | source/blender/render/intern/source/renderdatabase.c | 1 |
1 files changed, 1 insertions, 0 deletions
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]; |