[Bf-blender-cvs] [ad40ae1] master: Fix T49327: Cycles OSL Mode: RGB Curves node only outputs gray scale images
Sergey Sharybin
noreply at git.blender.org
Mon Sep 12 16:15:08 CEST 2016
Commit: ad40ae1e061171f80c0f1917571b7268882cd2ff
Author: Sergey Sharybin
Date: Mon Sep 12 16:14:40 2016 +0200
Branches: master
https://developer.blender.org/rBad40ae1e061171f80c0f1917571b7268882cd2ff
Fix T49327: Cycles OSL Mode: RGB Curves node only outputs gray scale images
To be backported to 2.78 release.
===================================================================
M intern/cycles/kernel/shaders/node_rgb_curves.osl
===================================================================
diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl
index 984b7d4..0d5eeea 100644
--- a/intern/cycles/kernel/shaders/node_rgb_curves.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl
@@ -29,8 +29,8 @@ shader node_rgb_curves(
color c = (ColorIn - color(min_x, min_x, min_x)) / (max_x - min_x);
color r = rgb_ramp_lookup(ramp, c[0], 1, 1);
- color g = rgb_ramp_lookup(ramp, c[0], 1, 1);
- color b = rgb_ramp_lookup(ramp, c[0], 1, 1);
+ color g = rgb_ramp_lookup(ramp, c[1], 1, 1);
+ color b = rgb_ramp_lookup(ramp, c[2], 1, 1);
ColorOut[0] = r[0];
ColorOut[1] = g[1];
More information about the Bf-blender-cvs
mailing list