1 files changed, 16 insertions, 23 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.cc b/source/blender/nodes/shader/nodes/node_shader_output_material.cc
index 5fc95b92e3f..e96f55cf3cf 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_material.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_output_material.cc
@@ -36,31 +36,24 @@ static int node_shader_gpu_output_material(GPUMaterial *mat,
                                            GPUNodeStack *in,
                                            GPUNodeStack *out)
 {
-  GPUNodeLink *outlink, *alpha_threshold_link, *shadow_threshold_link;
-  Material *ma = GPU_material_get_material(mat);
-
-  static float no_alpha_threshold = -1.0f;
-  if (ma) {
-    alpha_threshold_link = GPU_uniform((ma->blend_method == MA_BM_CLIP) ? &ma->alpha_threshold :
-                                                                          &no_alpha_threshold);
-    shadow_threshold_link = GPU_uniform((ma->blend_shadow == MA_BS_CLIP) ? &ma->alpha_threshold :
-                                                                           &no_alpha_threshold);
+  GPUNodeLink *outlink_surface, *outlink_volume, *outlink_displacement, *outlink_thickness;
+  /* Passthrough node in order to do the right socket conversions (important for displacement). */
+  if (in[0].link) {
+    GPU_link(mat, "node_output_material_surface", in[0].link, &outlink_surface);
+    GPU_material_output_surface(mat, outlink_surface);
   }
-  else {
-    alpha_threshold_link = GPU_uniform(&no_alpha_threshold);
-    shadow_threshold_link = GPU_uniform(&no_alpha_threshold);
+  if (in[1].link) {
+    GPU_link(mat, "node_output_material_volume", in[1].link, &outlink_volume);
+    GPU_material_output_volume(mat, outlink_volume);
+  }
+  if (in[2].link) {
+    GPU_link(mat, "node_output_material_displacement", in[2].link, &outlink_displacement);
+    GPU_material_output_displacement(mat, outlink_displacement);
+  }
+  if (in[3].link) {
+    GPU_link(mat, "node_output_material_thickness", in[3].link, &outlink_thickness);
+    GPU_material_output_thickness(mat, outlink_thickness);
   }
-
-  GPU_stack_link(mat,
-                 node,
-                 "node_output_material",
-                 in,
-                 out,
-                 alpha_threshold_link,
-                 shadow_threshold_link,
-                 &outlink);
-  GPU_material_output_link(mat, outlink);
-
   return true;
 }