diff options
| author | Matt Ebb <matt@mke3.net> | 2011-06-25 04:33:36 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2011-06-25 04:33:36 +0400 |
| commit | 826ed5ed1de68b556a8ea96c27cae0580af956ed (patch) | |
| tree | 16f879776128e340ca124fe301fcd5ea4f379d33 | |
| parent | a03707d408b9e37cd11124c93b1516eae9522139 (diff) | |
Fix [#27748] undeterministic behaviour of volumetric renderer
* Made clearer in the UI that the approximate multiple scattering always enables light cache
* Fixed a potential problem in anisotropic scattering
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/volume_precache.c | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/volumetric.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 52d6b5f1376..31da9598641 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -883,7 +883,7 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel, bpy.types.Panel): sub = col.column() sub.enabled = True sub.active = False - sub.prop(vol, "use_light_cache") + sub.label("Light Cache Enabled") col.prop(vol, "cache_resolution") sub = col.column(align=True) diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index 8293143a2a6..faa915b7f6c 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -523,7 +523,6 @@ static void *vol_precache_part(void *data) continue; } - /* this view coordinate is very wrong! */ copy_v3_v3(shi->view, cco); normalize_v3(shi->view); vol_get_scattering(shi, scatter_col, cco); diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index c4e741b6c61..359002d05ae 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -534,6 +534,7 @@ static void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, if (luminance(lacol) < 0.001f) return; + normalize_v3(lv); p = vol_get_phasefunc(shi, shi->mat->vol.asymmetry, shi->view, lv); /* physically based scattering with non-physically based RGB gain */ |