diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-15 16:33:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-15 17:19:23 +0400 |
| commit | 72308669cebd401535bc533a6c1af9e6f420438e (patch) | |
| tree | 8c9333b464e69af0613418f5bb178cbcc2e586a8 /intern/cycles/kernel/shaders | |
| parent | 97881d06b221fbe5db98c5e5b3d2b9ecd0a22b38 (diff) | |
Fix T39284: clamp cycles volume density to be >= 0, to avoid accidental strange shading.
Diffstat (limited to 'intern/cycles/kernel/shaders')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_absorption_volume.osl | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_scatter_volume.osl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/shaders/node_absorption_volume.osl b/intern/cycles/kernel/shaders/node_absorption_volume.osl index 69c4c0ef7af..6bac83ba4f5 100644 --- a/intern/cycles/kernel/shaders/node_absorption_volume.osl +++ b/intern/cycles/kernel/shaders/node_absorption_volume.osl @@ -21,6 +21,6 @@ shader node_absorption_volume( float Density = 1.0, output closure color Volume = 0) { - Volume = ((color(1.0, 1.0, 1.0) - Color) * Density) * absorption(); + Volume = ((color(1.0, 1.0, 1.0) - Color) * max(Density, 0.0)) * absorption(); } diff --git a/intern/cycles/kernel/shaders/node_scatter_volume.osl b/intern/cycles/kernel/shaders/node_scatter_volume.osl index bf23abbf933..77c157bd92b 100644 --- a/intern/cycles/kernel/shaders/node_scatter_volume.osl +++ b/intern/cycles/kernel/shaders/node_scatter_volume.osl @@ -22,6 +22,6 @@ shader node_scatter_volume( float Anisotropy = 0.0, output closure color Volume = 0) { - Volume = (Color * Density) * henyey_greenstein(Anisotropy); + Volume = (Color * max(Density, 0.0)) * henyey_greenstein(Anisotropy); } |