[Bf-blender-cvs] [1ed610e] master: Fix OSL compilation, cannot assign vector to color.
Thomas Dinges
noreply at git.blender.org
Fri Jan 1 18:06:18 CET 2016
Commit: 1ed610ed73807f7aa82b38e3572bb3a1829a1de7
Author: Thomas Dinges
Date: Fri Jan 1 18:05:34 2016 +0100
Branches: master
https://developer.blender.org/rB1ed610ed73807f7aa82b38e3572bb3a1829a1de7
Fix OSL compilation, cannot assign vector to color.
===================================================================
M intern/cycles/kernel/shaders/node_vector_curves.osl
===================================================================
diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl
index 65a59de..f7f7734 100644
--- a/intern/cycles/kernel/shaders/node_vector_curves.osl
+++ b/intern/cycles/kernel/shaders/node_vector_curves.osl
@@ -59,7 +59,7 @@ shader node_vector_curves(
float Fac = 0.0,
output vector VectorOut = vector(0.0, 0.0, 0.0))
{
- color c = (VectorIn - vector(min_x, min_x, min_x)) / (max_x - min_x);
+ vector c = (VectorIn - vector(min_x, min_x, min_x)) / (max_x - min_x);
VectorOut[0] = ramp_lookup(ramp, c[0], 0);
VectorOut[1] = ramp_lookup(ramp, c[1], 1);
More information about the Bf-blender-cvs
mailing list