Merge branch 'master' into functionsfunctions

1 files changed, 2 insertions, 2 deletions

diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index e201118574b..8316fa3cf9b 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -230,7 +230,7 @@ class NoiseTextureNode : public TextureNode {
   SHADER_NODE_CLASS(NoiseTextureNode)
 
   int dimensions;
-  float w, scale, detail, distortion;
+  float w, scale, detail, roughness, distortion;
   float3 vector;
 };
 
@@ -291,7 +291,7 @@ class WaveTextureNode : public TextureNode {
   NodeWaveRingsDirection rings_direction;
   NodeWaveProfile profile;
 
-  float scale, distortion, detail, detail_scale, phase;
+  float scale, distortion, detail, detail_scale, detail_roughness, phase;
   float3 vector;
 };