diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-17 16:11:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-17 16:11:15 +0400 |
| commit | 13b9b0ae033830996b48f2934f11acc56cb2ddf6 (patch) | |
| tree | 6d997e8d96918c337bfae37a3c9885bb041fc70a /source/blender/render | |
| parent | 3175ecbcc0c6cb62c244d34ab3c67aac3ec8a36c (diff) | |
Fix for bug #9075: the crash with stars rendering was not
completely fixed yet.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 15d41d45d88..ed9b98c2ada 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -182,7 +182,7 @@ static void halo_pixelstruct(HaloRen *har, RenderLayer **rlpp, int totsample, in amount+= amountm; zz= calchalo_z(har, ps->z); - if((zz> har->zs) || (har->mat->mode & MA_HALO_SOFT)) { + if((zz> har->zs) || (har->mat && (har->mat->mode & MA_HALO_SOFT))) { if(shadeHaloFloat(har, col, zz, dist, xn, yn, flarec)) { flarec= 0; @@ -300,7 +300,7 @@ static void halo_tile(RenderPart *pa, RenderLayer *rl) } else { zz= calchalo_z(har, *rz); - if((zz> har->zs) || (har->mat->mode & MA_HALO_SOFT)) { + if((zz> har->zs) || (har->mat && (har->mat->mode & MA_HALO_SOFT))) { if(shadeHaloFloat(har, col, zz, dist, xn, yn, har->flarec)) { for(sample=0; sample<totsample; sample++) addalphaAddfacFloat(rlpp[sample]->rectf + od*4, col, har->add); |