projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
bugfix #18196
[blender.git]
/
source
/
blender
/
render
/
intern
/
source
/
renderdatabase.c
diff --git
a/source/blender/render/intern/source/renderdatabase.c
b/source/blender/render/intern/source/renderdatabase.c
index d44b49cc7065a812d603db7928141e2f247235b9..621831fb34111883f64f8423e43c9d9afbfdbedb 100644
(file)
--- 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;
}
}