Merge branch 'blender-v2.93-release'

2021-05-19 12:17:23 +02:00
parent 7adb415070 a294670bac
commit 81e3d904db
2 changed files with 24 additions and 9 deletions
--- a/source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl
+++ b/source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl
@@ -37,8 +37,13 @@ void node_geometry(vec3 I,
  normal = (toworld * vec4(N, 0.0)).xyz;
  true_normal = normal;
 #  endif
+
+#  ifdef HAIR_SHADER
+  tangent = -hairTangent;
+#  else
  tangent_orco_z(orco, orco);
  node_tangent(N, orco, objmat, tangent);
+#  endif

  parametric = vec3(barycentric, 0.0);
  backfacing = (gl_FrontFacing) ? 0.0 : 1.0;