diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-03 23:57:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-03 23:57:52 +0300 |
| commit | 33a23853e125ac586fbef8c8e86b9c7a4144c7eb (patch) | |
| tree | 045697f3fcedd39901d59ceeb0cd4ec7dcd1b2cd /source | |
| parent | e657211812ceb4899d07fa76e430f68d81c03a16 (diff) | |
fix for bug [#8065] Crash when baking.
http://projects.blender.org/tracker/index.php?func=detail&aid=8065&group_id=9&atid=125
Lamp ray_samp_method could be an invalid value while rendering because a check was only done in the user interface.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index e4c62c15034..c25a1aeadf8 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -3391,6 +3391,13 @@ static GroupObject *add_render_lamp(Render *re, Object *ob) lar->area_sizez= la->area_sizez; lar->area_shape= la->area_shape; + + /* Annoying, lamp UI does this, but the UI might not have been used? - add here too. + * make sure this matches buttons_shading.c's logic */ + if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL) && (la->mode & LA_SHAD_RAY)) + if (ELEM3(la->type, LA_SPOT, LA_SUN, LA_LOCAL)) + if (la->ray_samp_method == LA_SAMP_CONSTANT) la->ray_samp_method = LA_SAMP_HALTON; + lar->ray_samp_method= la->ray_samp_method; lar->ray_samp_type= la->ray_samp_type; |