diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-20 18:32:42 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-20 18:32:42 +0400 |
| commit | 4506e6590268a7d5a18e8f2a4c272d684110fc22 (patch) | |
| tree | bfaf17998256fcc7067452aa3aa9b92bcadc9a82 /source/blender/blenkernel/intern/material.c | |
| parent | 54248633676b8d00fd9b8bc291b0679d8915624a (diff) | |
More preview fixes, after irc reports:
- Ztransp looked weird in Node previews, only showing the backfacing pixels
- previous change in preview.blend accidentally set camera clipping too low
for correct display of lamp preview
- refresh issue solved in preview when using Node shaders with ray-mirror
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 43e96c40ef4..14ae494d454 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -610,10 +610,11 @@ static void do_init_render_material(Material *ma, int osa, float *amb) if(osa) ma->texco |= TEXCO_OSA; } - ma->ambr= ma->amb*amb[0]; - ma->ambg= ma->amb*amb[1]; - ma->ambb= ma->amb*amb[2]; - + if(amb) { + ma->ambr= ma->amb*amb[0]; + ma->ambg= ma->amb*amb[1]; + ma->ambb= ma->amb*amb[2]; + } /* will become or-ed result of all node modes */ ma->mode_l= ma->mode; } |