Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-10 15:44:24 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-10 15:44:24 +0400
commit34d73922974aba08e783839e0291aee59f4adc8c (patch)
tree4a7424a064e4b0ce97a7025cf6a5ba60c4d8c554 /intern/cycles/kernel/shaders/node_rgb_ramp.osl
parente46551246ca305d0b723a7fb0e955e4852b1efdc (diff)
Fix #35282: cycles color ramp set to constant interpolation did not work well.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_rgb_ramp.osl')
-rw-r--r--intern/cycles/kernel/shaders/node_rgb_ramp.osl3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
index bac4b9552e0..2e0784c8ecf 100644
--- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
@@ -22,6 +22,7 @@
shader node_rgb_ramp(
color ramp_color[RAMP_TABLE_SIZE] = {0.0},
float ramp_alpha[RAMP_TABLE_SIZE] = {0.0},
+ int ramp_interpolate = 1,
float Fac = 0.0,
output color Color = 0.0,
@@ -38,7 +39,7 @@ shader node_rgb_ramp(
Color = ramp_color[i];
Alpha = ramp_alpha[i];
- if (t > 0.0) {
+ if (ramp_interpolate && t > 0.0) {
Color = (1.0 - t) * Color + t * ramp_color[i + 1];
Alpha = (1.0 - t) * Alpha + t * ramp_alpha[i + 1];
}