diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-03 08:40:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-03 08:40:33 +0300 |
| commit | 1286a16ea41d62519753b332bf015725e9da19ff (patch) | |
| tree | 37514eb8659077d81b83e18479274afd452b88e3 /source/blender/render | |
| parent | 28c137a8ebf759f9dd1c91645c0f98d4cc83974c (diff) | |
[#20450] Crash before creating a volumetric material.
- volumetric material must be traceable
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 85442480a9c..9fa23c73ec6 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -192,9 +192,10 @@ void freeraytree(Render *re) static int is_raytraceable_vlr(Render *re, VlakRen *vlr) { - if((re->flag & R_BAKE_TRACE) || (vlr->mat->mode & MA_TRACEBLE)) - if(vlr->mat->material_type != MA_TYPE_WIRE) - return 1; + /* note: volumetric must be tracable, wire must not */ + if((re->flag & R_BAKE_TRACE) || (vlr->mat->mode & MA_TRACEBLE) || (vlr->mat->material_type == MA_TYPE_VOLUME)) + if(vlr->mat->material_type != MA_TYPE_WIRE) + return 1; return 0; } |