Hopefully a working merge with trunk (could be one error left in raytrace.c - will...
[blender.git] / source / blender / render / intern / source / renderdatabase.c
index 1bc1c1a712a96eca01d6a3053107db6de4a6abd2..484857fbbbcdbf7a5aafb32f0652e39e7af14413 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;
                }
        }