diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-26 01:31:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-26 01:31:17 +0400 |
| commit | eb80ce4d7f24778e1edcc3c88a9b071dd2e25b4c (patch) | |
| tree | 34a3ce693e362b69d5c01e8404b310ba4eca1304 /source/blender/render/intern/source/zbuf.c | |
| parent | 1b142434055e2b56b23991f0c9d695b6d4f33390 (diff) | |
2.5: Materials
* Diffuse/specular ramps works again.
* Wire is now a material type next to Surface and Halo.
* Removed Volume material type option until it is actually there.
* Some button layout tweaks.
Diffstat (limited to 'source/blender/render/intern/source/zbuf.c')
| -rw-r--r-- | source/blender/render/intern/source/zbuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 0d8f1be8c85..4436f3aa047 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -2154,7 +2154,7 @@ void zbuffer_solid(RenderPart *pa, RenderLayer *rl, void(*fillfunc)(RenderPart*, ma= vlr->mat; nofill= ma->mode & (MA_ZTRA|MA_ONLYCAST); env= (ma->mode & MA_ENV); - wire= (ma->mode & MA_WIRE); + wire= (ma->material_type == MA_TYPE_WIRE); for(zsample=0; zsample<samples; zsample++) { if(ma->mode & MA_ZINV || (zmaskpass && neg_zmask)) @@ -2341,7 +2341,7 @@ void zbuffer_shadow(Render *re, float winmat[][4], LampRen *lar, int *rectz, int c2= zbuf_shadow_project(cache, vlr->v2->index, obwinmat, vlr->v2->co, ho2); c3= zbuf_shadow_project(cache, vlr->v3->index, obwinmat, vlr->v3->co, ho3); - if((ma->mode & MA_WIRE) || (vlr->flag & R_STRAND)) { + if((ma->material_type == MA_TYPE_WIRE) || (vlr->flag & R_STRAND)) { if(vlr->v4) { c4= zbuf_shadow_project(cache, vlr->v4->index, obwinmat, vlr->v4->co, ho4); zbufclipwire(&zspan, 0, a+1, vlr->ec, ho1, ho2, ho3, ho4, c1, c2, c3, c4); @@ -2571,7 +2571,7 @@ void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(vo ma= vlr->mat; nofill= ma->mode & MA_ONLYCAST; env= (ma->mode & MA_ENV); - wire= (ma->mode & MA_WIRE); + wire= (ma->material_type == MA_TYPE_WIRE); } } else { @@ -3357,7 +3357,7 @@ static int zbuffer_abuf(RenderPart *pa, APixstr *APixbuf, ListBase *apsmbase, Re zspan= &zspans[zsample]; zspan->polygon_offset= polygon_offset; - if(ma->mode & (MA_WIRE)) { + if(ma->material_type == MA_TYPE_WIRE) { if(v4) zbufclipwire(zspan, i, zvlnr, vlr->ec, ho1, ho2, ho3, ho4, c1, c2, c3, c4); else |