Merge branch 'master' into wm-drag-drop-rewrite

3 files changed, 59 insertions, 23 deletions

diff --git a/intern/cycles/kernel/shaders/node_vector_math.osl b/intern/cycles/kernel/shaders/node_vector_math.osl
index fd5e27aa144..4fa9b3bb57b 100644
--- a/intern/cycles/kernel/shaders/node_vector_math.osl
+++ b/intern/cycles/kernel/shaders/node_vector_math.osl
@@ -92,7 +92,7 @@ shader node_vector_math(string type = "add",
     Vector = ceil(Vector1);
   }
   else if (type == "modulo") {
-    Vector = mod(Vector1, Vector2);
+    Vector = fmod(Vector1, Vector2);
   }
   else if (type == "fraction") {
     Vector = Vector1 - floor(Vector1);
diff --git a/intern/cycles/kernel/shaders/node_white_noise_texture.osl b/intern/cycles/kernel/shaders/node_white_noise_texture.osl
index f026fb4ab39..95f91d25e5e 100644
--- a/intern/cycles/kernel/shaders/node_white_noise_texture.osl
+++ b/intern/cycles/kernel/shaders/node_white_noise_texture.osl
@@ -15,23 +15,33 @@
  */
 
 #include "stdosl.h"
+#include "vector2.h"
+#include "vector4.h"
+#include "node_hash.h"
+
+#define vector3 point
 
 shader node_white_noise_texture(string dimensions = "3D",
                                 point Vector = point(0.0, 0.0, 0.0),
                                 float W = 0.0,
-                                output float Value = 0.0)
+                                output float Value = 0.0,
+                                output color Color = 0.0)
 {
   if (dimensions == "1D") {
     Value = noise("hash", W);
+    Color = hash_float_to_color(W);
   }
   else if (dimensions == "2D") {
     Value = noise("hash", Vector[0], Vector[1]);
+    Color = hash_vector2_to_color(vector2(Vector[0], Vector[1]));
   }
   else if (dimensions == "3D") {
     Value = noise("hash", Vector);
+    Color = hash_vector3_to_color(vector3(Vector[0], Vector[1], Vector[2]));
   }
   else if (dimensions == "4D") {
     Value = noise("hash", Vector, W);
+    Color = hash_vector4_to_color(vector4(Vector[0], Vector[1], Vector[2], W));
   }
   else {
     warning("%s", "Unknown dimension!");
diff --git a/intern/cycles/kernel/svm/svm_white_noise.h b/intern/cycles/kernel/svm/svm_white_noise.h
index 71d4591d25d..b30d85acaec 100644
--- a/intern/cycles/kernel/svm/svm_white_noise.h
+++ b/intern/cycles/kernel/svm/svm_white_noise.h
@@ -21,35 +21,61 @@ ccl_device void svm_node_tex_white_noise(KernelGlobals *kg,
                                          float *stack,
                                          uint dimensions,
                                          uint inputs_stack_offsets,
-                                         uint value_stack_offset,
+                                         uint ouptuts_stack_offsets,
                                          int *offset)
 {
-  uint vector_stack_offset, w_stack_offset;
+  uint vector_stack_offset, w_stack_offset, value_stack_offset, color_stack_offset;
   svm_unpack_node_uchar2(inputs_stack_offsets, &vector_stack_offset, &w_stack_offset);
+  svm_unpack_node_uchar2(ouptuts_stack_offsets, &value_stack_offset, &color_stack_offset);
 
   float3 vector = stack_load_float3(stack, vector_stack_offset);
   float w = stack_load_float(stack, w_stack_offset);
 
-  float value;
-  switch (dimensions) {
-    case 1:
-      value = hash_float_to_float(w);
-      break;
-    case 2:
-      value = hash_float2_to_float(make_float2(vector.x, vector.y));
-      break;
-    case 3:
-      value = hash_float3_to_float(vector);
-      break;
-    case 4:
-      value = hash_float4_to_float(make_float4(vector.x, vector.y, vector.z, w));
-      break;
-    default:
-      value = 0.0f;
-      kernel_assert(0);
-      break;
+  if (stack_valid(color_stack_offset)) {
+    float3 color;
+    switch (dimensions) {
+      case 1:
+        color = hash_float_to_float3(w);
+        break;
+      case 2:
+        color = hash_float2_to_float3(make_float2(vector.x, vector.y));
+        break;
+      case 3:
+        color = hash_float3_to_float3(vector);
+        break;
+      case 4:
+        color = hash_float4_to_float3(make_float4(vector.x, vector.y, vector.z, w));
+        break;
+      default:
+        color = make_float3(1.0f, 0.0f, 1.0f);
+        kernel_assert(0);
+        break;
+    }
+    stack_store_float3(stack, color_stack_offset, color);
+  }
+
+  if (stack_valid(value_stack_offset)) {
+    float value;
+    switch (dimensions) {
+      case 1:
+        value = hash_float_to_float(w);
+        break;
+      case 2:
+        value = hash_float2_to_float(make_float2(vector.x, vector.y));
+        break;
+      case 3:
+        value = hash_float3_to_float(vector);
+        break;
+      case 4:
+        value = hash_float4_to_float(make_float4(vector.x, vector.y, vector.z, w));
+        break;
+      default:
+        value = 0.0f;
+        kernel_assert(0);
+        break;
+    }
+    stack_store_float(stack, value_stack_offset, value);
   }
-  stack_store_float(stack, value_stack_offset, value);
 }
 
 CCL_NAMESPACE_END