diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 21:02:43 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 21:02:43 +0300 |
commit | dbd9b7590af7a3dde3805bf23f78a6e0c6b1fe99 (patch) | |
tree | 8aa4b73de65bd84d91495abc3ece0e017e17cdfb /intern | |
parent | b54b14582bbd65103b5b052168dd8353e261d2ea (diff) | |
parent | ec559912fbcb51b713e1f33d4931af5fb52fd85b (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/shaders/node_hsv.osl | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_hsv.h | 5 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/intern/cycles/kernel/shaders/node_hsv.osl b/intern/cycles/kernel/shaders/node_hsv.osl index 8d9e50fed6b..9d7b7cde23a 100644 --- a/intern/cycles/kernel/shaders/node_hsv.osl +++ b/intern/cycles/kernel/shaders/node_hsv.osl @@ -28,9 +28,8 @@ shader node_hsv( color Color = rgb_to_hsv(ColorIn); // remember: fmod doesn't work for negative numbers - Color[0] += Hue + 0.5; - Color[0] = fmod(Color[0], 1.0); - Color[1] *= Saturation; + Color[0] = fmod(Color[0] + Hue + 0.5, 1.0); + Color[1] *= clamp(Saturation, 0.0, 1.0); Color[2] *= Value; Color = hsv_to_rgb(Color); diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/svm_hsv.h index 41538d1138d..e69a4ee9154 100644 --- a/intern/cycles/kernel/svm/svm_hsv.h +++ b/intern/cycles/kernel/svm/svm_hsv.h @@ -37,9 +37,8 @@ ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, ui color = rgb_to_hsv(color); /* remember: fmod doesn't work for negative numbers here */ - color.x += hue + 0.5f; - color.x = fmodf(color.x, 1.0f); - color.y *= sat; + color.x = fmodf(color.x + hue + 0.5f, 1.0f); + color.y *= saturate(sat); color.z *= val; color = hsv_to_rgb(color); diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 727cbe243ac..b70bad810de 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -3530,7 +3530,7 @@ void TextureCoordinateNode::compile(OSLCompiler& compiler) if(compiler.output_type() == SHADER_TYPE_VOLUME) compiler.parameter("is_volume", true); compiler.parameter(this, "use_transform"); - Transform ob_itfm = transform_transposed_inverse(ob_tfm); + Transform ob_itfm = transform_inverse(ob_tfm); compiler.parameter("object_itfm", ob_itfm); compiler.parameter(this, "from_dupli"); |