bugfix #18196
authorTon Roosendaal <ton@blender.org>
Tue, 7 Apr 2009 07:46:58 +0000 (07:46 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 7 Apr 2009 07:46:58 +0000 (07:46 +0000)
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

index d44b49cc7065a812d603db7928141e2f247235b9..621831fb34111883f64f8423e43c9d9afbfdbedb 100644 (file)
@@ -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;
                }
        }