diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-12-08 23:10:59 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-08 23:10:59 +0300 |
| commit | 5d2966283b82b8c5d4b1c47fcdd8511416dfbab8 (patch) | |
| tree | 342be7f35b159c160494295523820d20190e57d7 /source/blender/render | |
| parent | 8f8aa3f8639d4fe30b99cb5567f5f8c83050d6d6 (diff) | |
UI Cleanup: Halo materials and textures
* Textures applied to halo materials showed influence option for normal particles. This was really confusing, and with the cleanup I revealed a couple of hidden features too!
** Particles actually allow for textures to change halo size and hardness, but my guess is that nobody knew since the names were wrong in the ui!
** I also added the option to change the "add" value with a texture, since it was just silly not to have it.
* Halo material properties are also a bit cleaner now.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/renderdatabase.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 979d221dae0..db8b0b2c1fd 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -1189,6 +1189,11 @@ HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Mater har->hard = 1.0+126.0*texture_value_blend(mtex->def_var,((float)har->hard)/127.0,tin,mtex->hardfac,mtex->blendtype); if(mtex->mapto & MAP_RAYMIRR) har->hasize = 100.0*texture_value_blend(mtex->def_var,har->hasize/100.0,tin,mtex->raymirrfac,mtex->blendtype); + if(mtex->mapto & MAP_TRANSLU) { + float add = texture_value_blend(mtex->def_var,(float)har->add/255.0,tin,mtex->translfac,mtex->blendtype); + CLAMP(add, 0.f, 1.f); + har->add = 255.0*add; + } /* now what on earth is this good for?? */ //if(mtex->texco & 16) { // har->alfa= tin; |