diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-06 20:59:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-06 20:59:19 +0400 |
| commit | 5784b958237a435bd5fd0965eb9b940e654ada87 (patch) | |
| tree | 3e8a53c9645ff358e6da3c92981c688ceefaa012 /source | |
| parent | 6405342d9e55809a0764b3cff37a57aef522252f (diff) | |
Fix #23167: halo "texture" option did not take disabling of the texture
into account.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 60565d0ff16..0e98069f884 100644 --- 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 */ |