diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-04-07 11:46:58 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-04-07 11:46:58 +0400 |
| commit | 6b1ccddc0d921d096d42f5fa866ad444606da1c5 (patch) | |
| tree | 527ff0d41932f72942480f6162b0fec1dc4534ae /source/blender/render | |
| parent | 885fa49aa4cd49a552bfe6210e3cb4701c4a5d04 (diff) | |
bugfix #18196
Halos for objects (not particles) can get texture color, but they skipped
the alpha mapt-to channel when that was set. Actually bug from ehh 1995!
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/renderdatabase.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index d44b49cc706..621831fb341 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -1032,9 +1032,11 @@ HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma, float *vec, f har->g= (yn*tg+ zn*ma->g); har->b= (yn*tb+ zn*ma->b); } - if(mtex->texco & 16) { + if(mtex->texco & TEXCO_UV) { har->alfa= tin; } + if(mtex->mapto & MAP_ALPHA) + har->alfa= tin; } } |