1 files changed, 9 insertions, 18 deletions
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index baec3d7ac6e..89fc413c539 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -44,8 +44,6 @@ typedef enum NodeType {
 	NODE_CLOSURE_WEIGHT = 500,
 	NODE_MIX_CLOSURE = 600,
 	NODE_JUMP = 700,
-	NODE_TEX_NOISE_F = 800,
-	NODE_TEX_NOISE_V = 900,
 	NODE_TEX_IMAGE = 1000,
 	NODE_TEX_SKY = 1100,
 	NODE_GEOMETRY = 1200,
@@ -57,15 +55,12 @@ typedef enum NodeType {
 	NODE_CONVERT = 1900,
 	NODE_FRESNEL = 2000,
 	NODE_EMISSION_WEIGHT = 2100,
-	NODE_TEX_BLEND = 2200,
+	NODE_TEX_GRADIENT = 2200,
 	NODE_TEX_VORONOI = 2300,
 	NODE_TEX_MUSGRAVE = 2400,
-	NODE_TEX_MARBLE = 2500,
+	NODE_TEX_WAVE = 2500,
 	NODE_TEX_MAGIC = 2600,
-	NODE_TEX_STUCCI = 2700,
-	NODE_TEX_DISTORTED_NOISE = 2800,
-	NODE_TEX_WOOD = 2900,
-	NODE_TEX_CLOUDS = 3000,
+	NODE_TEX_NOISE = 3000,
 	NODE_SHADER_JUMP = 3100,
 	NODE_SET_DISPLACEMENT = 3200,
 	NODE_GEOMETRY_BUMP_DX = 3300,
@@ -83,7 +78,7 @@ typedef enum NodeType {
 	NODE_ATTR_BUMP_DY = 4500,
 	NODE_TEX_ENVIRONMENT = 4600,
 	NODE_CLOSURE_HOLDOUT = 4700,
-	NODE_BLEND_WEIGHT = 4800,
+	NODE_LAYER_WEIGHT = 4800,
 	NODE_CLOSURE_VOLUME = 4900
 } NodeType;
 
@@ -211,10 +206,8 @@ typedef enum NodeMusgraveType {
 } NodeMusgraveType;
 
 typedef enum NodeWoodType {
-	NODE_WOOD_BANDS,
-	NODE_WOOD_RINGS,
-	NODE_WOOD_BAND_NOISE,
-	NODE_WOOD_RING_NOISE
+	NODE_WAVE_BANDS,
+	NODE_WAVE_RINGS
 } NodeWoodType;
 
 typedef enum NodeBlendType {
@@ -246,14 +239,12 @@ typedef enum NodeStucciType {
 
 typedef enum NodeVoronoiColoring {
 	NODE_VORONOI_INTENSITY,
-	NODE_VORONOI_POSITION,
-	NODE_VORONOI_POSITION_OUTLINE,
-	NODE_VORONOI_POSITION_OUTLINE_INTENSITY
+	NODE_VORONOI_CELLS
 } NodeVoronoiColoring;
 
 typedef enum NodeBlendWeightType {
-	NODE_BLEND_WEIGHT_FRESNEL,
-	NODE_BLEND_WEIGHT_FACING
+	NODE_LAYER_WEIGHT_FRESNEL,
+	NODE_LAYER_WEIGHT_FACING
 } NodeBlendWeightType;
 
 typedef enum ShaderType {