From 6b1ccddc0d921d096d42f5fa866ad444606da1c5 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 7 Apr 2009 07:46:58 +0000 Subject: 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! --- source/blender/render/intern/source/renderdatabase.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/render') 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; } } -- cgit v1.2.3