Merge branch 'blender-v3.3-release'

# Conflicts:
#	release/scripts/addons

2 files changed, 23 insertions, 0 deletions

diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
index a63c7aede04..2f75b7b533f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
@@ -167,6 +167,27 @@ static int node_shader_gpu_bsdf_principled(GPUMaterial *mat,
   if (use_transparency) {
     flag |= GPU_MATFLAG_TRANSPARENT;
   }
+  if (use_clear) {
+    flag |= GPU_MATFLAG_CLEARCOAT;
+  }
+
+  /* Ref. T98190: Defines are optimizations for old compilers.
+   * Might become unecessary with EEVEE-Next. */
+  if (use_diffuse == false && use_refract == false && use_clear == true) {
+    flag |= GPU_MATFLAG_PRINCIPLED_CLEARCOAT;
+  }
+  else if (use_diffuse == false && use_refract == false && use_clear == false) {
+    flag |= GPU_MATFLAG_PRINCIPLED_METALLIC;
+  }
+  else if (use_diffuse == true && use_refract == false && use_clear == false) {
+    flag |= GPU_MATFLAG_PRINCIPLED_DIELECTRIC;
+  }
+  else if (use_diffuse == false && use_refract == true && use_clear == false) {
+    flag |= GPU_MATFLAG_PRINCIPLED_GLASS;
+  }
+  else {
+    flag |= GPU_MATFLAG_PRINCIPLED_ANY;
+  }
 
   if (use_subsurf) {
     bNodeSocket *socket = (bNodeSocket *)BLI_findlink(&node->original->inputs, 2);
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_info.cc b/source/blender/nodes/shader/nodes/node_shader_volume_info.cc
index a202312f8d8..1f31e9c605f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_info.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_info.cc
@@ -25,9 +25,11 @@ static int node_shader_gpu_volume_info(GPUMaterial *mat,
   }
   if (out[1].hasoutput) {
     out[1].link = GPU_attribute(mat, CD_AUTO_FROM_NAME, "density");
+    GPU_link(mat, "node_attribute_density", out[1].link, &out[1].link);
   }
   if (out[2].hasoutput) {
     out[2].link = GPU_attribute(mat, CD_AUTO_FROM_NAME, "flame");
+    GPU_link(mat, "node_attribute_flame", out[2].link, &out[2].link);
   }
   if (out[3].hasoutput) {
     out[3].link = GPU_attribute(mat, CD_AUTO_FROM_NAME, "temperature");